From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Dec 2011 03:45:01 +0000 (+1100)
Subject: Merge remote-tracking branch 'l2-mtd/master'
X-Git-Tag: next-20111213~53
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a7de8e039248cc58efb110b280cf313c2d447ebe;p=karo-tx-linux.git

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

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

a7de8e039248cc58efb110b280cf313c2d447ebe