Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
	drivers/mtd/maps/lantiq-flash.c
	drivers/mtd/maps/pxa2xx-flash.c

diff --cc arch/arm/mach-at91/board-afeb-9260v1.c
Simple merge

diff --cc arch/arm/mach-at91/board-cam60.c
Simple merge

diff --cc arch/arm/mach-at91/board-cap9adk.c
Simple merge

diff --cc arch/arm/mach-at91/board-kb9202.c
Simple merge

diff --cc arch/arm/mach-at91/board-neocore926.c
Simple merge

diff --cc arch/arm/mach-at91/board-qil-a9260.c
Simple merge

diff --cc arch/arm/mach-at91/board-rm9200dk.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9-l9260.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9260ek.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9261ek.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9263ek.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9g20ek.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9m10g45ek.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9rlek.c
Simple merge

diff --cc arch/arm/mach-at91/board-snapper9260.c
Simple merge

diff --cc arch/arm/mach-at91/board-usb-a9260.c
Simple merge

diff --cc arch/arm/mach-at91/board-usb-a9263.c
Simple merge

diff --cc arch/arm/mach-at91/board-yl-9200.c
Simple merge

diff --cc arch/arm/mach-davinci/board-da830-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-da850-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm355-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm355-leopard.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm365-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm644x-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-mityomapl138.c
Simple merge

diff --cc arch/arm/mach-davinci/board-neuros-osd2.c
Simple merge

diff --cc arch/arm/mach-davinci/board-tnetv107x-evm.c
Simple merge

diff --cc arch/arm/mach-mmp/aspenite.c
Simple merge

diff --cc arch/arm/mach-pxa/cm-x300.c
Simple merge

diff --cc arch/arm/mach-pxa/littleton.c
Simple merge

diff --cc arch/arm/mach-pxa/raumfeld.c
Simple merge

diff --cc arch/arm/mach-pxa/zylonite.c
Simple merge

diff --cc drivers/mtd/devices/sst25l.c
Simple merge

diff --cc drivers/mtd/maps/bfin-async-flash.c
Simple merge

diff --cc drivers/mtd/maps/ixp2000.c
Simple merge

diff --cc drivers/mtd/maps/lantiq-flash.c
Simple merge

diff --cc drivers/mtd/mtdchar.c
Simple merge

diff --cc drivers/mtd/nand/atmel_nand.c
Simple merge

diff --cc drivers/mtd/nand/bcm_umi_nand.c
Simple merge

diff --cc drivers/mtd/nand/mpc5121_nfc.c
Simple merge