linux/drivers/mtd/nand
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
..
Kconfig
Makefile
alauda.c
ams-delta.c
atmel_nand.c
atmel_nand_ecc.h
au1550nd.c Merge git://git.infradead.org/mtd-2.6 2011-05-27 20:06:53 -07:00
autcpu12.c
bcm_umi_bch.c
bcm_umi_nand.c
bf5xx_nand.c
cafe_nand.c
cmx270_nand.c
cs553x_nand.c
davinci_nand.c
denali.c
denali.h
diskonchip.c
edb7312.c
fsl_elbc_nand.c
fsl_upm.c
fsmc_nand.c
gpio.c
h1910.c
jz4740_nand.c
mpc5121_nfc.c
mxc_nand.c
nand_base.c
nand_bbt.c
nand_bch.c
nand_bcm_umi.c
nand_bcm_umi.h
nand_ecc.c
nand_ids.c
nandsim.c
ndfc.c
nomadik_nand.c
nuc900_nand.c
omap2.c
orion_nand.c
pasemi_nand.c
plat_nand.c
ppchameleonevb.c
pxa3xx_nand.c
r852.c
r852.h
rtc_from4.c
s3c2410.c
sh_flctl.c
sharpsl.c
sm_common.c
sm_common.h
socrates_nand.c
spia.c
tmio_nand.c Merge git://git.infradead.org/mtd-2.6 2011-05-27 20:06:53 -07:00
txx9ndfmc.c