Linus Torvalds 29a6ccca38 Merge git://git.infradead.org/mtd-2.6 ... * git://git.infradead.org/mtd-2.6: (97 commits) mtd: kill CONFIG_MTD_PARTITIONS mtd: remove add_mtd_partitions, add_mtd_device and friends mtd: convert remaining users to mtd_device_register() mtd: samsung onenand: convert to mtd_device_register() mtd: omap2 onenand: convert to mtd_device_register() mtd: txx9ndfmc: convert to mtd_device_register() mtd: tmio_nand: convert to mtd_device_register() mtd: socrates_nand: convert to mtd_device_register() mtd: sharpsl: convert to mtd_device_register() mtd: s3c2410 nand: convert to mtd_device_register() mtd: ppchameleonevb: convert to mtd_device_register() mtd: orion_nand: convert to mtd_device_register() mtd: omap2: convert to mtd_device_register() mtd: nomadik_nand: convert to mtd_device_register() mtd: ndfc: convert to mtd_device_register() mtd: mxc_nand: convert to mtd_device_register() mtd: mpc5121_nfc: convert to mtd_device_register() mtd: jz4740_nand: convert to mtd_device_register() mtd: h1910: convert to mtd_device_register() mtd: fsmc_nand: convert to mtd_device_register() ... Fixed up trivial conflicts in - drivers/mtd/maps/integrator-flash.c: removed in ARM tree - drivers/mtd/maps/physmap.c: addition of afs partition probe type clashing with removal of CONFIG_MTD_PARTITIONS		2011-05-27 20:06:53 -07:00
..
chips	mtd: remove duplicate assignment of chip->state	2011-05-25 02:11:13 +01:00
devices	mtd: convert remaining users to mtd_device_register()	2011-05-25 02:25:00 +01:00
lpddr	mtd: remove duplicate assignment of chip->state	2011-05-25 02:11:13 +01:00
maps	Merge git://git.infradead.org/mtd-2.6	2011-05-27 20:06:53 -07:00
nand	Merge git://git.infradead.org/mtd-2.6	2011-05-27 20:06:53 -07:00
onenand	mtd: convert remaining users to mtd_device_register()	2011-05-25 02:25:00 +01:00
tests
ubi	Merge git://git.infradead.org/mtd-2.6	2011-05-27 20:06:53 -07:00
afs.c
ar7part.c
cmdlinepart.c
ftl.c
inftlcore.c
inftlmount.c
Kconfig	Merge git://git.infradead.org/mtd-2.6	2011-05-27 20:06:53 -07:00
Makefile	mtd: kill CONFIG_MTD_PARTITIONS	2011-05-25 02:25:35 +01:00
mtd_blkdevs.c	mtd: mtd_blkdevs: fix error path in blktrans_open	2011-05-25 01:53:45 +01:00
mtdblock_ro.c
mtdblock.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
mtdchar.c	mtd: kill CONFIG_MTD_PARTITIONS	2011-05-25 02:25:35 +01:00
mtdconcat.c	mtd: mtdconcat: fix NAND OOB write	2011-05-25 01:54:50 +01:00
mtdcore.c	mtd: remove add_mtd_partitions, add_mtd_device and friends	2011-05-25 02:25:16 +01:00
mtdcore.h	mtd: remove add_mtd_partitions, add_mtd_device and friends	2011-05-25 02:25:16 +01:00
mtdoops.c
mtdpart.c	mtd: remove add_mtd_partitions, add_mtd_device and friends	2011-05-25 02:25:16 +01:00
mtdsuper.c
mtdswap.c	mtd: mtdswap: fix possible null dereference	2011-05-25 02:11:44 +01:00
nftlcore.c
nftlmount.c
ofpart.c
redboot.c
rfd_ftl.c
sm_ftl.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
sm_ftl.h
ssfdc.c