From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 26 Sep 2012 02:31:38 +0000 (+1000)
Subject: Merge remote-tracking branch 'block/for-next'
X-Git-Tag: next-20120926~57
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5a031aa0cef2aab35e0587ef629068102472caff;p=karo-tx-linux.git

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

5a031aa0cef2aab35e0587ef629068102472caff
diff --cc init/Kconfig
index 186a482311a0,75633d3db5c9..1ced40bf80f0
--- a/init/Kconfig
+++ b/init/Kconfig
@@@ -1003,8 -1019,10 +1003,7 @@@ config UIDGID_CONVERTE
  	depends on !UML || HOSTFS = n
  
  	# The rare drivers that won't build
 -	depends on AIRO = n
 -	depends on AIRO_CS = n
 -	depends on TUN = n
  	depends on INFINIBAND_QIB = n
- 	depends on BLK_DEV_LOOP = n
  	depends on ANDROID_BINDER_IPC = n
  
  	# Security modules