Russell King ed40d0c472 Merge branch 'origin' into devel ...

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c

2009-03-28 20:29:51 +00:00

..

alchemy-flash.c

…

amd76xrom.c

…

autcpu12-nvram.c

…

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

…

h720x-flash.c

…

ichxrom.c

…

impa7.c

…

integrator-flash.c

[ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h

2009-03-25 10:21:35 +00:00

intel_vr_nor.c

…

ipaq-flash.c

…

ixp4xx.c

…

ixp2000.c

…

Kconfig

mtd: flash mapping support for Dreamcast VMU.

2009-03-10 18:03:02 +09:00

l440gx.c

…

Makefile

mtd: flash mapping support for Dreamcast VMU.

2009-03-10 18:03:02 +09:00

map_funcs.c

…

mbx860.c

…

netsc520.c

…

nettel.c

…

octagon-5066.c

…

omap_nor.c

…

pci.c

…

pcmciamtd.c

…

physmap_of.c

…

physmap.c

mtd: physmap: fix NULL pointer dereference in error path

2009-03-10 15:55:11 -07:00

plat-ram.c

…

pmcmsp-flash.c

…

pmcmsp-ramroot.c

…

pxa2xx-flash.c

platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'

2009-03-24 16:38:25 -07:00

redwood.c

…

rpxlite.c

…

sa1100-flash.c

[ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h

2009-03-25 10:21:35 +00:00

sbc8240.c

…

sbc_gxx.c

…

sc520cdp.c

…

scb2_flash.c

…

scx200_docflash.c

…

sharpsl-flash.c

…

solutionengine.c

…

sun_uflash.c

…

tqm8xxl.c

…

ts5500_flash.c

…

tsunami_flash.c

…

uclinux.c

…

vmax301.c

…

vmu-flash.c

mtd: flash mapping support for Dreamcast VMU.

2009-03-10 18:03:02 +09:00

wr_sbc82xx_flash.c

…