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

author Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 13 Dec 2011 06:22:07 +0000 (17:22 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 13 Dec 2011 06:22:07 +0000 (17:22 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 06:22:07 +0000 (17:22 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 06:22:07 +0000 (17:22 +1100)
diff --cc drivers/Kconfig

index 041426cfae14dca61bbb9ee35ef1e0b1013515c2,c91a13cc8c8f7384bcaa2511d57cc887ae51eef1..742f0288b98f7666884e20c9ad83c9d97a8ed1bb
--- 1/drivers/Kconfig
--- 2/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -136,6 -132,10 +136,8 @@@ source "drivers/iommu/Kconfig
   
   source "drivers/virt/Kconfig"
   
- -source "drivers/hv/Kconfig"
- -
   source "drivers/devfreq/Kconfig"
   
+ source "drivers/xshm/Kconfig"
+ 
   endmenu
diff --cc drivers/Makefile
Simple merge
diff --cc include/linux/Kbuild
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Dec 2011 06:22:07 +0000 (17:22 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Dec 2011 06:22:07 +0000 (17:22 +1100)
		1	2
drivers/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/Kbuild	patch \|	diff1 \|	diff2 \|	blob \| history