Tony Lindgren d702d12167 Merge with mainline to remove plat-omap/Kconfig conflict ...

Conflicts:
	arch/arm/plat-omap/Kconfig

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

..

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

…

gpio-addr-flash.c

…

h720x-flash.c

…

ichxrom.c

…

impa7.c

…

integrator-flash.c

…

intel_vr_nor.c

…

ixp4xx.c

mtd: ixp4xx map: use resource_size

2009-11-30 09:47:24 +00:00

ixp2000.c

…

Kconfig

Merge with mainline to remove plat-omap/Kconfig conflict

2010-03-01 14:19:05 -08: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

…

omap_nor.c

MTD: remove no longer used OMAP flash map

2010-02-15 10:03:32 -08:00

pci.c

…

pcmciamtd.c

pcmcia: pcmcia_request_window() doesn't need a pointer to a pointer

2009-11-28 18:02:58 +01:00

physmap_of.c

…

physmap.c

mtd: error return -EIO instead of EIO

2009-11-30 09:51:44 +00:00

pismo.c

mtd: Really add ARM pismo support

2010-01-13 09:04:53 +00:00

plat-ram.c

…

pmcmsp-flash.c

…

pxa2xx-flash.c

ARM: 5848/1: kill flush_ioremap_region()

2009-12-14 14:53:21 +00: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

…

sc520cdp.c

…

scb2_flash.c

…

scx200_docflash.c

…

solutionengine.c

…

sun_uflash.c

…

tqm8xxl.c

…

ts5500_flash.c

…

tsunami_flash.c

…

uclinux.c

…

vmax301.c

…

vmu-flash.c

mtd: error return -EIO instead of EIO

2009-11-30 09:51:44 +00:00

wr_sbc82xx_flash.c

…