From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Dec 2011 02:24:20 +0000 (+1100)
Subject: Merge remote-tracking branch 'l2-mtd/master'
X-Git-Tag: next-20111221~55
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5a0e766046d013862648536c5f85eeb5a98e688b;p=karo-tx-linux.git

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

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

5a0e766046d013862648536c5f85eeb5a98e688b