From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 29 Jul 2011 03:49:19 +0000 (+1000)
Subject: Merge remote-tracking branch 'l2-mtd/master'
X-Git-Tag: next-20110729~38
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=39247c62b47ff569c0175abe702562e4835f21dc;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
---

39247c62b47ff569c0175abe702562e4835f21dc