From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 2 Apr 2012 01:18:18 +0000 (+1000)
Subject: Merge remote-tracking branch 'l2-mtd/master'
X-Git-Tag: next-20120402~34
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=db603f1606a84d6180a92b42568051d1e0e8910c;p=karo-tx-linux.git

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

Conflicts:
	drivers/dma/mxs-dma.c
	drivers/mmc/host/mxs-mmc.c
	drivers/mtd/devices/spear_smi.c
	drivers/mtd/nand/Kconfig
	drivers/mtd/nand/atmel_nand.c
	drivers/mtd/nand/docg4.c
	drivers/mtd/nand/gpmi-nand/gpmi-lib.c
	fs/jffs2/fs.c
	include/linux/mtd/spear_smi.h
	sound/soc/mxs/mxs-pcm.h
---

db603f1606a84d6180a92b42568051d1e0e8910c