From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 8 Oct 2012 00:56:06 +0000 (+1100)
Subject: Merge remote-tracking branch 'block/for-next'
X-Git-Tag: next-20121008~38
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=792d5c573c4406290b888513165ec9e4f62f414e;p=karo-tx-linux.git

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

Conflicts:
	init/Kconfig
---

792d5c573c4406290b888513165ec9e4f62f414e