From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 19 Aug 2011 01:02:32 +0000 (+1000)
Subject: Merge remote-tracking branch 'l2-mtd/master'
X-Git-Tag: next-20110819~41
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bafbf229601afbbc5d868dfb739b5c44d3831d19;p=karo-tx-linux.git

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

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

bafbf229601afbbc5d868dfb739b5c44d3831d19