p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
linux_old1/drivers/mtd/nand
History
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 mtd: kill CONFIG_MTD_PARTITIONS 2011-05-25 02:25:35 +01:00
Makefile mtd: nand: add software BCH ECC support 2011-03-11 17:49:08 +00:00
alauda.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
ams-delta.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
atmel_nand.c mtd: atmel_nand: convert to mtd_device_register() 2011-05-25 02:23:12 +01:00
atmel_nand_ecc.h [ARM] 5265/3: [AT91] Add copyright info 2008-09-21 23:01:18 +01:00
au1550nd.c Merge git://git.infradead.org/mtd-2.6 2011-05-27 20:06:53 -07:00
autcpu12.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
bcm_umi_bch.c mtd: add bcmring nand driver 2009-10-20 10:07:23 +09:00
bcm_umi_nand.c mtd: bcm_umi_nand: convert to mtd_device_register() 2011-05-25 02:23:14 +01:00
bf5xx_nand.c mtd: bf5xx_nand: convert to mtd_device_register() 2011-05-25 02:23:15 +01:00
cafe_nand.c mtd: cafe_nand: convert to mtd_device_register() 2011-05-25 02:23:16 +01:00
cmx270_nand.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
cs553x_nand.c mtd: cs553x_nand: convert to mtd_device_register() 2011-05-25 02:23:18 +01:00
davinci_nand.c mtd: davinci_nand: convert to mtd_device_register() 2011-05-25 02:23:20 +01:00
denali.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
denali.h mtd: denali: detect the number of banks 2011-05-25 02:02:12 +01:00
diskonchip.c mtd: diskonchip: convert to mtd_device_register() 2011-05-25 02:23:21 +01:00
edb7312.c mtd: edb7312 nand: convert to mtd_device_register() 2011-05-25 02:23:23 +01:00
fsl_elbc_nand.c mtd: fsl_elbc_nand: convert to mtd_device_register() 2011-05-25 02:23:25 +01:00
fsl_upm.c mtd: fsl_upm: convert to mtd_device_register() 2011-05-25 02:23:26 +01:00
fsmc_nand.c mtd: fsmc_nand: convert to mtd_device_register() 2011-05-25 02:23:28 +01:00
gpio.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
h1910.c mtd: h1910: convert to mtd_device_register() 2011-05-25 02:23:29 +01:00
jz4740_nand.c mtd: jz4740_nand: convert to mtd_device_register() 2011-05-25 02:23:30 +01:00
mpc5121_nfc.c mtd: mpc5121_nfc: convert to mtd_device_register() 2011-05-25 02:23:32 +01:00
mxc_nand.c mtd: mxc_nand: convert to mtd_device_register() 2011-05-25 02:23:38 +01:00
nand_base.c mtd: nand: convert to mtd_device_register() 2011-05-25 02:20:13 +01:00
nand_bbt.c mtd: nand: dynamic allocation of flash-based BBT structs 2011-05-25 01:50:14 +01:00
nand_bch.c mtd: nand: add software BCH ECC support 2011-03-11 17:49:08 +00:00
nand_bcm_umi.c mtd: add bcmring nand driver 2009-10-20 10:07:23 +09:00
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: support new Toshiba SLC 2010-10-24 23:38:30 +01:00
nandsim.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
ndfc.c mtd: ndfc: convert to mtd_device_register() 2011-05-25 02:23:44 +01:00
nomadik_nand.c mtd: nomadik_nand: convert to mtd_device_register() 2011-05-25 02:23:45 +01:00
nuc900_nand.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
omap2.c mtd: omap2: convert to mtd_device_register() 2011-05-25 02:23:46 +01:00
orion_nand.c mtd: orion_nand: convert to mtd_device_register() 2011-05-25 02:23:47 +01:00
pasemi_nand.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
plat_nand.c mtd: plat_nand: convert to mtd_device_register() 2011-05-25 02:20:24 +01:00
ppchameleonevb.c mtd: ppchameleonevb: convert to mtd_device_register() 2011-05-25 02:23:48 +01:00
pxa3xx_nand.c mtd: pxa: convert to mtd_device_register() 2011-05-25 02:20:48 +01:00
r852.c Fix common misspellings 2011-03-31 11:26:23 -03:00
r852.h mtd: r852: remove useless pci powerup/down from suspend/resume routines 2010-10-25 01:32:21 +01:00
rtc_from4.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
s3c2410.c mtd: s3c2410 nand: convert to mtd_device_register() 2011-05-25 02:23:52 +01:00
sh_flctl.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
sharpsl.c mtd: sharpsl: convert to mtd_device_register() 2011-05-25 02:23:53 +01:00
sm_common.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
sm_common.h mtd: sm_common: split smartmedia and xD table 2010-05-14 01:03:46 +01:00
socrates_nand.c mtd: socrates_nand: convert to mtd_device_register() 2011-05-25 02:23:54 +01:00
spia.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
tmio_nand.c Merge git://git.infradead.org/mtd-2.6 2011-05-27 20:06:53 -07:00
txx9ndfmc.c mtd: txx9ndfmc: convert to mtd_device_register() 2011-05-25 02:23:57 +01:00