From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 10 Aug 2011 00:18:32 +0000 (+1000)
Subject: Merge remote-tracking branch 'l2-mtd/master'
X-Git-Tag: next-20110810~36
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b562a31819ed236747c9c4e78b8c78410cca0ab7;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
---

b562a31819ed236747c9c4e78b8c78410cca0ab7