linux/drivers/mtd/maps
Linus Torvalds 22ae77bc7a Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (53 commits)
  [MTD] struct device - replace bus_id with dev_name(), dev_set_name()
  [MTD] [NOR] Fixup for Numonyx M29W128 chips
  [MTD] mtdpart: Make ecc_stats more realistic.
  powerpc/85xx: TQM8548: Update DTS file for multi-chip support
  powerpc: NAND: FSL UPM: document new bindings
  [MTD] [NAND] FSL-UPM: Add wait flags to support board/chip specific delays
  [MTD] [NAND] FSL-UPM: add multi chip support
  [MTD] [NOR] Add device parent info to physmap_of
  [MTD] [NAND] Add support for NAND on the Socrates board
  [MTD] [NAND] Add support for 4KiB pages.
  [MTD] sysfs support should not depend on CONFIG_PROC_FS
  [MTD] [NAND] Add parent info for CAFÉ controller
  [MTD] support driver model updates
  [MTD] driver model updates (part 2)
  [MTD] driver model updates
  [MTD] [NAND] move gen_nand's probe function to .devinit.text
  [MTD] [MAPS] move sa1100 flash's probe function to .devinit.text
  [MTD] fix use after free in register_mtd_blktrans
  [MTD] [MAPS] Drop now unused sharpsl-flash map
  [MTD] ofpart: Check name property to determine partition nodes.
  ...

Manually fix trivial conflict in drivers/mtd/maps/Makefile
2009-04-06 14:56:26 -07:00
..
Kconfig Merge git://git.infradead.org/mtd-2.6 2009-04-06 14:56:26 -07:00
Makefile Merge git://git.infradead.org/mtd-2.6 2009-04-06 14:56:26 -07:00
alchemy-flash.c
amd76xrom.c
autcpu12-nvram.c
bfin-async-flash.c
cdb89712.c
ceiva.c
cfi_flagadm.c
ck804xrom.c
dbox2-flash.c
dc21285.c
dilnetpc.c
dmv182.c
edb7312.c
esb2rom.c
fortunet.c
h720x-flash.c
ichxrom.c
impa7.c
integrator-flash.c
intel_vr_nor.c
ipaq-flash.c
ixp4xx.c
ixp2000.c
l440gx.c
map_funcs.c
mbx860.c
netsc520.c
nettel.c
octagon-5066.c
omap_nor.c [MTD] support driver model updates 2009-04-04 14:32:59 +01:00
pci.c
pcmciamtd.c
physmap.c [MTD] support driver model updates 2009-04-04 14:32:59 +01:00
physmap_of.c [MTD] [NOR] Add device parent info to physmap_of 2009-04-06 07:15:42 -07:00
plat-ram.c [MTD] support driver model updates 2009-04-04 14:32:59 +01:00
pmcmsp-flash.c
pmcmsp-ramroot.c
pxa2xx-flash.c
rbtx4939-flash.c
redwood.c
rpxlite.c
sa1100-flash.c Merge git://git.infradead.org/mtd-2.6 2009-04-06 14:56:26 -07:00
sbc8240.c
sbc_gxx.c
sc520cdp.c
scb2_flash.c
scx200_docflash.c
solutionengine.c
sun_uflash.c
tqm8xxl.c
ts5500_flash.c
tsunami_flash.c
uclinux.c
vmax301.c
vmu-flash.c
wr_sbc82xx_flash.c