From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 29 Oct 2012 01:03:21 +0000 (+1100)
Subject: Merge remote-tracking branch 'block/for-next'
X-Git-Tag: next-20121029~53
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=10555a7961442e5c2cb10e6301cd2ddb24f42a26;p=karo-tx-linux.git

Merge remote-tracking branch 'block/for-next'

Conflicts:
	init/Kconfig
---

10555a7961442e5c2cb10e6301cd2ddb24f42a26