David Woodhouse 67577927e8 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git ... Conflicts: drivers/mtd/mtd_blkdevs.c Merge Grant's device-tree bits so that we can apply the subsequent fixes. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>		2010-10-30 12:35:11 +01:00
..
amd76xrom.c
autcpu12-nvram.c
bcm963xx-flash.c	mtd: add Broadcom BCM63xx image tag partition parser	2010-10-25 00:13:05 +01:00
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
gpio-addr-flash.c	mtd: maps: gpio-addr-flash: fix warnings and make more portable	2010-10-25 01:16:17 +01:00
h720x-flash.c
ichxrom.c
impa7.c
integrator-flash.c
intel_vr_nor.c
ixp4xx.c	mtd: ixp4xx: add support for static flash partitions	2010-08-04 10:57:00 +01:00
ixp2000.c
Kconfig	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2010-10-30 12:35:11 +01:00
l440gx.c
Makefile	mtd: add Broadcom BCM63xx image tag partition parser	2010-10-25 00:13:05 +01:00
map_funcs.c
mbx860.c
netsc520.c
nettel.c
octagon-5066.c
pci.c
pcmciamtd.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2010-10-30 12:35:11 +01:00
physmap_of.c	mtd: physmap_of: Loop through all "reg" tuples for mapping	2010-10-25 01:12:46 +01:00
physmap.c	mtd-physmap: add support users can assign the probe type in board files	2010-08-08 12:28:15 +01:00
pismo.c
plat-ram.c
pmcmsp-flash.c
pxa2xx-flash.c
rbtx4939-flash.c
rpxlite.c
sa1100-flash.c
sbc_gxx.c
sc520cdp.c
scb2_flash.c
scx200_docflash.c
solutionengine.c
sun_uflash.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
tqm8xxl.c
ts5500_flash.c
tsunami_flash.c
uclinux.c
vmax301.c
vmu-flash.c
wr_sbc82xx_flash.c