Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus ...

Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c

2010-03-08 16:55:37 +01:00

..

amd76xrom.c

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

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

autcpu12-nvram.c

…

bfin-async-flash.c

Nicolas Pitre has a new email address

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

cdb89712.c

…

ceiva.c

Nicolas Pitre has a new email address

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

cfi_flagadm.c

[MTD] Make init_flagadm function static

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

ck804xrom.c

[MTD] [MAPS] Remove MODULE_DEVICE_TABLE() from ck804rom driver.

2009-02-27 04:52:45 +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

…

dmv182.c

…

edb7312.c

[MTD] Make the init_edb7312nor function static

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

esb2rom.c

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

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

fortunet.c

[MTD] Make init_fortunet function static

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

gpio-addr-flash.c

mtd/maps: gpio-addr-flash: pull in linux/ headers rather than asm/

2009-09-24 12:50:32 -07:00

h720x-flash.c

[MTD] Make h720x_mtd_init function static

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

ichxrom.c

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

2008-12-10 13:37:21 +00: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

…

ixp4xx.c

mtd: ixp4xx map: use resource_size

2009-11-30 09:47:24 +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

…

Makefile

Merge with mainline to remove plat-omap/Kconfig conflict

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

map_funcs.c

…

mbx860.c

[MTD] Make init_mbx function static

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

netsc520.c

…

nettel.c

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

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

octagon-5066.c

[MTD] Make init_oct5066 function static

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

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

mtd: maps: add mtd-ram support to physmap_of

2009-09-19 13:15:26 -07:00

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

Fix spelling of 'platform' in comments and doc

2010-02-05 12:22:34 +01:00

pmcmsp-flash.c

mtd: pmcmsp-flash: fix error paths in init_msp_flash

2009-09-04 09:42:06 +01:00

pxa2xx-flash.c

ARM: 5848/1: kill flush_ioremap_region()

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

…

sc520cdp.c

…

scb2_flash.c

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

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

scx200_docflash.c

…

solutionengine.c

…

sun_uflash.c

…

tqm8xxl.c

[MTD] Make init_tqm_mtd function static

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

ts5500_flash.c

…

tsunami_flash.c

…

uclinux.c

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

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

vmax301.c

[MTD] Make the function init_vmax301 static

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

vmu-flash.c

mtd: error return -EIO instead of EIO

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

wr_sbc82xx_flash.c

[MTD] Make init_sbc82xx_flash function static

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