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	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
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	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2010-05-10 14:32:46 +01:00
cdb89712.c
ceiva.c	mtd: maps: ceiva: do not return random numbers	2010-02-25 12:50:45 +00:00
cfi_flagadm.c
ck804xrom.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
dbox2-flash.c
dc21285.c
dilnetpc.c
dmv182.c
edb7312.c
esb2rom.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
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	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
impa7.c
integrator-flash.c
intel_vr_nor.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ixp4xx.c	mtd: ixp4xx: add support for static flash partitions	2010-08-04 10:57:00 +01:00
ixp2000.c	drivers/mtd: Use kzalloc	2010-05-13 21:23:06 +01:00
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	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
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.c	mtd-physmap: add support users can assign the probe type in board files	2010-08-08 12:28:15 +01:00
physmap_of.c	mtd: physmap_of: Loop through all "reg" tuples for mapping	2010-10-25 01:12:46 +01:00
pismo.c	i2c: Remove all i2c_set_clientdata(client, NULL) in drivers	2010-06-03 11:33:58 +02:00
plat-ram.c
pmcmsp-flash.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
pxa2xx-flash.c	drivers/mtd: Use kzalloc	2010-05-13 21:23:06 +01:00
rbtx4939-flash.c
rpxlite.c
sa1100-flash.c
sbc_gxx.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
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	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
vmu-flash.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
wr_sbc82xx_flash.c