Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree ... Merging in current state of Linus' tree to deal with merge conflicts and build failures in vio.c after merge. Conflicts: drivers/i2c/busses/i2c-cpm.c drivers/i2c/busses/i2c-mpc.c drivers/net/gianfar.c Also fixed up one line in arch/powerpc/kernel/vio.c to use the correct node pointer. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>		2010-05-22 00:36:56 -06: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
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	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
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	drivers/mtd: Use kzalloc	2010-05-13 21:23:06 +01:00
ixp2000.c	drivers/mtd: Use kzalloc	2010-05-13 21:23:06 +01:00
Kconfig	pcmciamtd: fixing obvious errors	2010-05-14 03:23:01 +01:00
l440gx.c
Makefile	Merge with mainline to remove plat-omap/Kconfig conflict	2010-03-01 14:19:05 -08: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 git://git.infradead.org/mtd-2.6	2010-05-21 07:25:43 -07:00
physmap_of.c	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
physmap.c	mtd/maps/physmap: catch failure to register MTD_PHYSMAP_COMPAT device	2010-04-20 08:53:52 +01:00
pismo.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
plat-ram.c	Fix spelling of 'platform' in comments and doc	2010-02-05 12:22:34 +01:00
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
redwood.c
rpxlite.c
sa1100-flash.c	ARM: Fix warning in sa1100-flash.c	2009-11-16 16:13:35 +00:00
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: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -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