kevin/linux
1
Fork 0
Code
b9f141acf2
linux/drivers/mtd/nand
History
Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree 
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2010-05-22 00:36:56 -06:00
..
alauda.c mtd: nand: make USB device id constant 2010-02-25 11:26:31 +00:00
ams-delta.c
atmel_nand_ecc.h
atmel_nand.c mtd: nand: Allow caller to pass alternative ID table to nand_scan_ident() 2010-02-26 18:32:56 +00:00
au1550nd.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2010-03-26 14:55:59 +00:00
autcpu12.c
bcm_umi_bch.c
bcm_umi_nand.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2010-05-10 14:32:46 +01:00
bf5xx_nand.c mtd: Blackfin NFC: localize MMR bit masks 2010-05-10 14:16:43 +01:00
cafe_nand.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2010-05-10 14:32:46 +01:00
cmx270_nand.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
cs553x_nand.c
davinci_nand.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2010-05-10 14:32:46 +01:00
denali.c mtd/nand: Fix denali build on ppc64 2010-05-13 16:12:45 +01:00
denali.h mtd/nand: Add Intel Moorestown/Denali NAND support 2010-05-13 16:12:16 +01:00
diskonchip.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
edb7312.c
fsl_elbc_nand.c Merge remote branch 'origin' into secretlab/next-devicetree 2010-05-22 00:36:56 -06:00
fsl_upm.c Merge remote branch 'origin' into secretlab/next-devicetree 2010-05-22 00:36:56 -06:00
gpio.c mtd: drivers/mtd/nand/gpio.c: use resource_size() 2009-12-31 20:47:01 +00:00
h1910.c
Kconfig mtd/nand: Add Intel Moorestown/Denali NAND support 2010-05-13 16:12:16 +01:00
Makefile mtd/nand: Add Intel Moorestown/Denali NAND support 2010-05-13 16:12:16 +01:00
mpc5121_nfc.c mtd: update gfp/slab.h includes 2010-05-19 17:21:52 +01:00
mxc_nand.c mtd: mxc_nand: Remove duplicate NAND_CMD_RESET case value 2010-05-20 10:10:33 +01:00
nand_base.c mtd: nand: support alternate BB marker locations on MLC 2010-05-14 01:56:12 +01:00
nand_bbt.c mtd: nand: support alternate BB marker locations on MLC 2010-05-14 01:56:12 +01:00
nand_bcm_umi.c
nand_bcm_umi.h mtd: nand_bcm: fix hot spin and code duplication 2010-02-26 16:56:35 +00:00
nand_ecc.c Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
nand_ids.c mtd: nand: add Toshiba TC58NVG0 device ID 2010-05-14 03:25:52 +01:00
nandsim.c mtd: nandsim: make some structures anonymous 2010-05-10 14:12:06 +01:00
ndfc.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
nomadik_nand.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2010-05-10 14:32:46 +01:00
nuc900_nand.c mtd: nand: rename w90p910_nand.c to nuc900_nand.c 2010-01-01 12:16:47 +00:00
omap2.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2010-05-10 14:32:46 +01:00
orion_nand.c mtd: orion/kirkwood: add RnB line support to orion mtd driver 2010-05-14 01:04:19 +01:00
pasemi_nand.c Merge remote branch 'origin' into secretlab/next-devicetree 2010-05-22 00:36:56 -06:00
plat_nand.c
ppchameleonevb.c
pxa3xx_nand.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2010-05-10 14:32:46 +01:00
r852.c mtd: update gfp/slab.h includes 2010-05-19 17:21:52 +01:00
r852.h mtd: nand: Add driver for Ricoh xD/SmartMedia reader 2010-02-26 19:22:38 +00:00
rtc_from4.c
s3c2410.c drivers/mtd/nand: Use kzalloc 2010-05-13 21:21:38 +01:00
sh_flctl.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2010-05-10 14:32:46 +01:00
sharpsl.c
sm_common.c mtd: sm_common: split smartmedia and xD table 2010-05-14 01:03:46 +01:00
sm_common.h mtd: sm_common: split smartmedia and xD table 2010-05-14 01:03:46 +01:00
socrates_nand.c Merge remote branch 'origin' into secretlab/next-devicetree 2010-05-22 00:36:56 -06:00
spia.c
tmio_nand.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2010-05-10 14:32:46 +01:00
txx9ndfmc.c mtd: nand: Allow caller to pass alternative ID table to nand_scan_ident() 2010-02-26 18:32:56 +00:00