From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 9 Aug 2011 01:48:09 +0000 (+1000)
Subject: Merge remote-tracking branch 'l2-mtd/master'
X-Git-Tag: next-20110809~32
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=229eaa82c6f9894d1167b96b34a37ea4adbe71f3;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
---

229eaa82c6f9894d1167b96b34a37ea4adbe71f3