From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 1 Aug 2011 02:22:33 +0000 (+1000)
Subject: Merge remote-tracking branch 'l2-mtd/master'
X-Git-Tag: next-20110801~30
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=022ba568f0a2ec6d97a9af5e2dcea000dc7e0553;p=karo-tx-linux.git

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

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

022ba568f0a2ec6d97a9af5e2dcea000dc7e0553