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

Conflicts:

	drivers/mtd/Kconfig

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

2007-04-27 19:16:19 +01:00

..

alchemy-flash.c

[MTD] Alchemy cleanups

2007-04-17 18:19:58 +01:00

amd76xrom.c

[MTD] [MAPS] amd76xrom warning fix

2007-02-18 16:42:25 +00:00

arctic-mtd.c

…

autcpu12-nvram.c

…

bast-flash.c

[MTD] Remove trailing whitespace

2006-11-30 08:17:38 +00:00

beech-mtd.c

…

cdb89712.c

…

ceiva.c

…

cfi_flagadm.c

…

ck804xrom.c

[MTD] [MAPS] ck804xrom warning fix

2007-02-18 16:41:47 +00:00

dbox2-flash.c

…

dc21285.c

…

dilnetpc.c

[MTD] [MAPS] dilnetpc: Fix printk warning

2007-03-08 09:46:28 +00:00

dmv182.c

…

ebony.c

…

edb7312.c

…

esb2rom.c

[MTD] ESB2 check for closed ROM window

2007-03-08 09:21:42 +00:00

fortunet.c

…

h720x-flash.c

…

ichxrom.c

[MTD] [MAPS] ichxrom warning fix

2007-02-18 16:42:51 +00:00

impa7.c

…

integrator-flash.c

…

ipaq-flash.c

…

ixp4xx.c

…

ixp2000.c

…

Kconfig

Use menuconfig objects: MTD

2007-04-19 16:21:41 -05:00

l440gx.c

…

lasat.c

…

lubbock-flash.c

…

mainstone-flash.c

…

Makefile

[MTD] PMC MSP71xx flash/rootfs mappings

2007-04-02 14:10:58 -04:00

map_funcs.c

…

mbx860.c

…

mpc1211.c

…

mtx-1_flash.c

…

netsc520.c

[MTD] [MAPS] netsc520 warning fix

2007-02-18 16:41:31 +00:00

nettel.c

[MTD] Remove trailing whitespace

2006-11-30 08:17:38 +00:00

ocelot.c

…

ocotea.c

…

octagon-5066.c

…

omap_nor.c

…

omap-toto-flash.c

…

pci.c

…

pcmciamtd.c

…

physmap_of.c

[MTD] of_device-based physmap driver

2006-12-08 13:32:34 +00:00

physmap.c

…

plat-ram.c

[MTD] [MAPS] fix plat-ram printk format

2007-04-26 07:28:58 +01:00

pmcmsp-flash.c

[MTD] PMC MSP71xx flash/rootfs mappings

2007-04-02 14:10:58 -04:00

pmcmsp-ramroot.c

[MTD] PMC MSP71xx flash/rootfs mappings

2007-04-02 14:10:58 -04:00

pnc2000.c

…

pq2fads.c

…

redwood.c

…

rpxlite.c

…

sa1100-flash.c

…

sbc8240.c

…

sbc_gxx.c

…

sc520cdp.c

[MTD] [MAPS] sc520cdp warning fix

2007-02-18 16:41:01 +00:00

scb2_flash.c

…

scx200_docflash.c

…

sharpsl-flash.c

…

solutionengine.c

…

sun_uflash.c

[SPARC/64] constify of_get_property return: drivers

2007-04-26 01:54:27 -07:00

tqm8xxl.c

…

tqm834x.c

…

ts5500_flash.c

…

tsunami_flash.c

…

uclinux.c

…

vmax301.c

…

walnut.c

…

wr_sbc82xx_flash.c

…