From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 16 Oct 2012 00:32:51 +0000 (+1100)
Subject: Merge remote-tracking branch 'block/for-next'
X-Git-Tag: next-20121016~37
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3b90d2986930d7e9c686303c054e2bd88ade9e99;p=karo-tx-linux.git

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

Conflicts:
	init/Kconfig
---

3b90d2986930d7e9c686303c054e2bd88ade9e99