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
..
alauda.c
ams-delta.c
atmel_nand_ecc.h
atmel_nand.c	mtd: atmel_nand: fix warning: 'part_probes' defined but not used	2010-08-06 09:22:22 +01:00
au1550nd.c
autcpu12.c
bcm_umi_bch.c
bcm_umi_nand.c
bf5xx_nand.c	mtd: Blackfin NFC: fix invalid free in remove()	2010-09-13 08:49:03 +01:00
cafe_nand.c	Update broken web addresses in the kernel.	2010-10-18 11:03:14 +02:00
cmx270_nand.c
cs553x_nand.c
davinci_nand.c	nand: davinci: add support for timing configuration	2010-09-24 07:40:26 -07:00
denali.c	nand/denali: move all hardware initialization work to denali_hw_init	2010-08-12 11:10:40 +01:00
denali.h	nand/denali: use dev_xx debug function to replace nand_dbg_print and some printk	2010-08-11 00:28:40 +01:00
diskonchip.c	mtd: Remove obsolete <mtd/compatmac.h> include	2010-08-08 21:19:42 +01:00
edb7312.c
fsl_elbc_nand.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
fsl_upm.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
gpio.c
h1910.c
jz4740_nand.c
Kconfig	Merge git://git.infradead.org/mtd-2.6	2010-08-10 11:49:21 -07:00
Makefile
mpc5121_nfc.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
mxc_nand.c	mxc_nand: do not depend on disabling the irq in the interrupt handler	2010-10-18 13:09:05 -07:00
nand_base.c	mtd: nand: Fix probe of Samsung NAND chips	2010-08-20 22:26:20 +01:00
nand_bbt.c	mtd: Remove obsolete <mtd/compatmac.h> include	2010-08-08 21:19:42 +01:00
nand_bcm_umi.c
nand_bcm_umi.h
nand_ecc.c
nand_ids.c	mtd/nand_ids: Fix buswidth	2010-08-13 21:11:54 +01:00
nandsim.c
ndfc.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
nomadik_nand.c
nuc900_nand.c
omap2.c	fix OMAP2 MTD build failure	2010-09-29 13:17:56 -07:00
orion_nand.c
pasemi_nand.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
plat_nand.c	gen_nand: Test if nr_chips field is valid	2010-08-12 12:17:36 +01:00
ppchameleonevb.c
pxa3xx_nand.c	mtd: pxa3xx: fix build error when CONFIG_MTD_PARTITIONS is not defined	2010-09-13 08:50:42 +01:00
r852.c
r852.h
rtc_from4.c	mtd: Remove obsolete <mtd/compatmac.h> include	2010-08-08 21:19:42 +01:00
s3c2410.c
sh_flctl.c
sharpsl.c
sm_common.c
sm_common.h
socrates_nand.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
spia.c
tmio_nand.c
txx9ndfmc.c