David Woodhouse 0ae28a35bc Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:
	drivers/mtd/mtdcore.c

Pull in the bdi fixes and ARM platform changes that other outstanding
patches depend on.

2010-05-10 14:32:46 +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

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +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

[ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants

2008-11-13 15:05:03 +00:00

ceiva.c

mtd: maps: ceiva: do not return random numbers

2010-02-25 12:50:45 +00:00

cfi_flagadm.c

[MTD] Make init_flagadm function static

2008-12-10 13:01:00 +00:00

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

[MTD] Make init_dbox2_flash static

2008-12-10 13:01:02 +00:00

dc21285.c

Nicolas Pitre has a new email address

2009-09-15 09:37:12 -07:00

dilnetpc.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

dmv182.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

edb7312.c

[MTD] Make the init_edb7312nor function static

2008-12-10 13:00:51 +00:00

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

[MTD] Make init_fortunet function static

2008-12-10 13:01:13 +00:00

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

[MTD] Make h720x_mtd_init function static

2008-12-10 13:01:23 +00:00

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

[MTD] Make init_impa7 static

2008-12-10 13:01:32 +00:00

integrator-flash.c

mtd: maps: Remove BUS_ID_SIZE from integrator_flash

2009-06-24 16:02:06 +01:00

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: fix reading from half-word boundary

2010-02-25 11:28:56 +00:00

ixp2000.c

trivial: fix typo "to to" in multiple files

2009-09-21 15:14:55 +02:00

Kconfig

Merge with mainline to remove plat-omap/Kconfig conflict

2010-03-01 14:19:05 -08:00

l440gx.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

Makefile

Merge with mainline to remove plat-omap/Kconfig conflict

2010-03-01 14:19:05 -08:00

map_funcs.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

mbx860.c

[MTD] Make init_mbx function static

2008-12-10 13:01:20 +00:00

netsc520.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

nettel.c

[MTD] [MAPS] Fix printk format warning in nettel.c

2009-01-09 14:17:50 +00:00

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

[MTD] [MAPS] Remove unused variable after ROM API cleanup.

2008-10-14 11:00:51 +01:00

pcmciamtd.c

mtd: maps: Eliminate use after free

2010-05-10 14:22:55 +01:00

physmap_of.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

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

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

rbtx4939-flash.c

[MTD] Remove mtd->{suspend,resume} calls from board drivers

2009-05-26 16:45:44 +01:00

redwood.c

[MTD] Make init_redwood_flash function static

2008-12-10 13:01:29 +00:00

rpxlite.c

[MTD] Make init_rpxlite function static

2008-12-10 13:00:43 +00:00

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

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

scb2_flash.c

[MTD] update internal API to support 64-bit device size

2008-12-10 13:37:21 +00:00

scx200_docflash.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

solutionengine.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

sun_uflash.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

tqm8xxl.c

[MTD] Make init_tqm_mtd function static

2008-12-10 13:00:37 +00:00

ts5500_flash.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

tsunami_flash.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

uclinux.c

mtd/maps: uclinux: fix building when partition support is disabled

2009-09-19 11:44:51 -07:00

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

[MTD] Make init_sbc82xx_flash function static

2008-12-10 13:00:47 +00:00