linux-stable-rt/arch/arm/mach-davinci
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
..
include/mach
Kconfig
Makefile
Makefile.boot
aemif.c
board-da830-evm.c
board-da850-evm.c
board-dm355-evm.c
board-dm355-leopard.c
board-dm365-evm.c
board-dm644x-evm.c
board-dm646x-evm.c
board-mityomapl138.c
board-neuros-osd2.c
board-omapl138-hawk.c
board-sffsdr.c
board-tnetv107x-evm.c
cdce949.c
clock.c
clock.h
common.c
cp_intc.c
cpufreq.c
cpuidle.c
da830.c
da850.c
devices-da8xx.c
devices-tnetv107x.c
devices.c Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci 2010-10-25 10:59:31 -07:00
dm355.c
dm365.c
dm644x.c
dm646x.c
dma.c
gpio-tnetv107x.c
gpio.c
io.c
irq.c
mux.c
mux.h
pm.c
psc.c
serial.c
sleep.S
sram.c
time.c
tnetv107x.c
usb.c