From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Dec 2011 05:30:22 +0000 (+1100)
Subject: Merge remote-tracking branch 'xshm/xshm-for-next'
X-Git-Tag: next-20111221~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b45bb25ed01f10cfe6eb7701a73de3e769c0e56e;p=karo-tx-linux.git

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

b45bb25ed01f10cfe6eb7701a73de3e769c0e56e
diff --cc drivers/Kconfig
index 041426cfae14,c91a13cc8c8f..742f0288b98f
--- a/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