From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Oct 2012 03:31:41 +0000 (+1000)
Subject: Merge remote-tracking branch 'block/for-next'
X-Git-Tag: next-20121003~42
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c795ce50a6b12aa8b09813295090cd197c95a567;p=karo-tx-linux.git

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

Conflicts:
	init/Kconfig
---

c795ce50a6b12aa8b09813295090cd197c95a567