Linus Torvalds 72e58063d6 Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci
* 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (50 commits)
  davinci: fix remaining board support after io_pgoffst removal
  davinci: mityomapl138: make file local data static
  arm/davinci: remove duplicated include
  davinci: Initial support for Omapl138-Hawkboard
  davinci: MityDSP-L138/MityARM-1808 read MAC address from I2C Prom
  davinci: add tnetv107x touchscreen platform device
  input: add driver for tnetv107x touchscreen controller
  davinci: add keypad config for tnetv107x evm board
  davinci: add tnetv107x keypad platform device
  input: add driver for tnetv107x on-chip keypad controller
  net: davinci_emac: cleanup unused cpdma code
  net: davinci_emac: switch to new cpdma layer
  net: davinci_emac: separate out cpdma code
  net: davinci_emac: cleanup unused mdio emac code
  omap: cleanup unused davinci mdio arch code
  davinci: cleanup mdio arch code and switch to phy_id
  net: davinci_emac: switch to new mdio
  omap: add mdio platform devices
  davinci: add mdio platform devices
  net: davinci_emac: separate out davinci mdio
  ...

Fix up trivial conflict in drivers/input/keyboard/Kconfig (two entries
added next to each other - one from the davinci merge, one from the
input merge)
2010-10-25 10:59:31 -07:00
..
2010-10-21 07:19:02 -07:00
2010-09-29 19:45:37 -07:00
2010-10-21 03:59:57 -07:00
2010-10-21 03:09:43 -07:00
2010-09-26 18:34:29 -07:00
2010-09-26 18:34:29 -07:00
2010-10-06 14:10:35 -07:00
2010-10-14 10:45:56 -07:00
2010-10-14 10:45:56 -07:00
2010-10-14 10:45:56 -07:00
2010-09-26 18:34:29 -07:00
2010-09-26 18:34:29 -07:00
2010-09-29 13:23:30 -07:00
2010-09-26 18:34:29 -07:00
2010-09-26 18:34:29 -07:00
2010-09-26 18:34:29 -07:00
2010-10-21 01:26:46 -07:00
2010-10-21 03:52:11 -07:00
2010-10-21 03:52:11 -07:00
2010-09-08 21:47:13 -07:00
2010-09-26 18:34:29 -07:00
2010-09-26 18:34:29 -07:00
2010-09-26 18:34:29 -07:00
2010-09-15 22:06:05 -07:00
2010-10-12 17:36:09 +02:00
2010-09-21 18:04:47 -07:00
2010-09-21 18:04:47 -07:00
2010-09-21 18:04:47 -07:00
2010-09-26 18:34:29 -07:00
2010-09-26 18:34:29 -07:00
2010-09-26 18:34:29 -07:00
2010-09-26 18:34:29 -07:00
2010-09-26 18:34:29 -07:00
2010-09-26 18:34:29 -07:00
2010-09-26 18:34:29 -07:00
2010-09-26 18:34:29 -07:00