OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/drivers/mtd/maps
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 Merge git://git.infradead.org/mtd-2.6 2011-05-27 20:06:53 -07:00
Makefile Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate 2011-05-23 18:05:10 +01:00
amd76xrom.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
autcpu12-nvram.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
bcm963xx-flash.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
bfin-async-flash.c mtd: bfin: convert to mtd_device_register() 2011-05-25 02:20:59 +01:00
cdb89712.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
ceiva.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
cfi_flagadm.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
ck804xrom.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
dbox2-flash.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
dc21285.c mtd: dc21285: convert to mtd_device_register() 2011-05-25 02:21:36 +01:00
dilnetpc.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
dmv182.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
edb7312.c mtd: edb7312: convert to mtd_device_register() 2011-05-25 02:21:40 +01:00
esb2rom.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
fortunet.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
gpio-addr-flash.c mtd: gpio-addr-flash: convert to mtd_device_register() 2011-05-25 02:21:43 +01:00
h720x-flash.c mtd: h720x-flash: convert to mtd_device_register() 2011-05-25 02:21:46 +01:00
ichxrom.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
impa7.c mtd: impa7: convert to mtd_device_register() 2011-05-25 02:21:48 +01:00
intel_vr_nor.c mtd: intel_vr_nor: convert to mtd_device_register() 2011-05-25 02:21:51 +01:00
ixp4xx.c mtd: ixp: convert to mtd_device_register() 2011-05-25 02:20:41 +01:00
ixp2000.c mtd: ixp: convert to mtd_device_register() 2011-05-25 02:20:41 +01:00
l440gx.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
lantiq-flash.c MIPS: Lantiq: Add NOR flash support 2011-05-19 09:55:42 +01:00
latch-addr-flash.c mtd: latch-addr-flash: convert to mtd_device_register() 2011-05-25 02:21:59 +01:00
map_funcs.c
…
mbx860.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
netsc520.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
nettel.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
octagon-5066.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
pci.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
pcmciamtd.c Merge git://git.infradead.org/mtd-2.6 2011-05-27 20:06:53 -07:00
physmap.c Merge git://git.infradead.org/mtd-2.6 2011-05-27 20:06:53 -07:00
physmap_of.c mtd: physmap: convert to mtd_device_register() 2011-05-25 02:15:37 +01:00
pismo.c ARM: 6910/1: MTD: physmap: let set_vpp() pass a platform_device instead of a map_info 2011-05-20 22:27:34 +01:00
plat-ram.c mtd: plat-ram: convert to mtd_device_register() 2011-05-25 02:22:00 +01:00
pmcmsp-flash.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
pxa2xx-flash.c mtd: pxa: convert to mtd_device_register() 2011-05-25 02:20:48 +01:00
rbtx4939-flash.c mtd: rbtx4939-flash: convert to mtd_device_register() 2011-05-25 02:22:01 +01:00
rpxlite.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
sa1100-flash.c mtd: sa1100-flash: convert to mtd_device_register() 2011-05-25 02:22:03 +01:00
sbc_gxx.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
sc520cdp.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
scb2_flash.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
scx200_docflash.c mtd: scx200_docflash: convert to mtd_device_register() 2011-05-25 02:22:04 +01:00
solutionengine.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
sun_uflash.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
tqm8xxl.c mtd: tqm8xll: convert to mtd_device_register() 2011-05-25 02:22:57 +01:00
ts5500_flash.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
tsunami_flash.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
uclinux.c mtd: uclinux: convert to mtd_device_register() 2011-05-25 02:23:09 +01:00
vmax301.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
vmu-flash.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
wr_sbc82xx_flash.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00