From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 18 Oct 2012 00:47:11 +0000 (+1100)
Subject: Merge remote-tracking branch 'block/for-next'
X-Git-Tag: next-20121018~40
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7282e077b2b04026d51560cb8df8953ee73f3a5c;p=karo-tx-linux.git

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

Conflicts:
	init/Kconfig
---

7282e077b2b04026d51560cb8df8953ee73f3a5c