From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 9 Dec 2011 02:23:58 +0000 (+1100)
Subject: Merge remote-tracking branch 'l2-mtd/master'
X-Git-Tag: next-20111209~52
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fcf33521fc7cc79ae0d1a9a9e97cdadde5c17f30;p=karo-tx-linux.git

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

Conflicts:
	drivers/mtd/bcm63xxpart.c
---

fcf33521fc7cc79ae0d1a9a9e97cdadde5c17f30