renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 13:13:57 +08:00
Code
a1b383870a
linux-next/include/linux/mtd
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
..
bbm.h mtd: nand: introduce NAND_CREATE_EMPTY_BBT 2010-10-25 00:54:37 +01:00
blktrans.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1 2011-03-25 17:41:20 +02:00
cfi_endian.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
cfi.h Fix common misspellings 2011-03-31 11:26:23 -03:00
concat.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
doc2000.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
flashchip.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
fsmc.h mtd: FSMC NAND fix obvious speling errors 2010-12-03 16:35:40 +00:00
ftl.h
gen_probe.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
inftl.h mtd: inftl.h: fix spacing errors 2010-10-24 23:27:24 +01:00
latch-addr-flash.h mtd: NOR flash driver for OMAP-L137/AM17x 2011-03-11 14:22:47 +00:00
map.h mtd: Remove obsolete <mtd/compatmac.h> include 2010-08-08 21:19:42 +01:00
mtd.h mtd: kill CONFIG_MTD_PARTITIONS 2011-05-25 02:25:35 +01:00
mtdram.h mtd: mtdram.h: checkpatch cleanup 2010-05-10 14:11:30 +01:00
nand_bch.h mtd: nand: add software BCH ECC support 2011-03-11 17:49:08 +00:00
nand_ecc.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
nand-gpio.h
nand.h mtd: nand: renumber conflicting BBT flags 2011-05-25 01:49:43 +01:00
ndfc.h
nftl.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
onenand_regs.h OMAP: OneNAND: fix 104MHz support 2011-02-17 15:44:45 -08:00
onenand.h mtd: onenand: add new option to control initial onenand unlocking 2011-03-11 14:22:47 +00:00
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 mtd/nand/sh_flctl: Move function mtd_to_flctl to fix build failure 2010-05-12 23:24:23 +01:00
sharpsl.h
super.h convert get_sb_mtd() users to ->mount() 2010-10-29 04:16:26 -04:00
ubi.h UBI: fix minor stylistic issues 2011-04-14 11:34:41 +03:00
xip.h Fix common misspellings 2011-03-31 11:26:23 -03:00