From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 12 Oct 2011 05:00:43 +0000 (+1100)
Subject: Merge remote-tracking branch 'xen-two/linux-next'
X-Git-Tag: next-20111012~16
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=198c659f6a9df7bb91cacc517aa72ca4ccaeea97;p=karo-tx-linux.git

Merge remote-tracking branch 'xen-two/linux-next'

Conflicts:
	arch/x86/xen/Kconfig
---

198c659f6a9df7bb91cacc517aa72ca4ccaeea97
diff --cc arch/x86/xen/Kconfig
index 4d04d4f1acfb,26c731a106af..7cbcbd19b3d3
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@@ -49,15 -48,3 +48,7 @@@ config XEN_DEBUG_F
  	help
  	  Enable statistics output and various tuning options in debugfs.
  	  Enabling this option may incur a significant performance overhead.
 +
- config XEN_DEBUG
- 	bool "Enable Xen debug checks"
- 	depends on XEN
- 	default n
- 	help
- 	  Enable various WARN_ON checks in the Xen MMU code.
- 	  Enabling this option WILL incur a significant performance overhead.
- 
 +config MICROCODE_XEN
 +       def_bool y
 +       depends on XEN_DOM0 && MICROCODE