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
..
bbm.h
blktrans.h
cfi.h
cfi_endian.h
concat.h
doc2000.h
flashchip.h
fsmc.h
ftl.h
gen_probe.h
inftl.h
latch-addr-flash.h
map.h
mtd.h	mtd: kill CONFIG_MTD_PARTITIONS	2011-05-25 02:25:35 +01:00
mtdram.h
nand-gpio.h
nand.h	mtd: nand: renumber conflicting BBT flags	2011-05-25 01:49:43 +01:00
nand_bch.h
nand_ecc.h
ndfc.h
nftl.h
onenand.h
onenand_regs.h
partitions.h	mtd: remove add_mtd_partitions, add_mtd_device and friends	2011-05-25 02:25:16 +01:00
pfow.h
physmap.h	Merge git://git.infradead.org/mtd-2.6	2011-05-27 20:06:53 -07:00
pismo.h
plat-ram.h
pmc551.h
qinfo.h
sh_flctl.h
sharpsl.h
super.h
ubi.h	UBI: fix minor stylistic issues	2011-04-14 11:34:41 +03:00
xip.h