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

Conflicts:
	arch/x86/xen/Kconfig

diff --cc arch/x86/xen/Kconfig
index 4d04d4f1acfbb96816761b1f698bd44df2eda2dd,ae559fe91c250efe1f75b38bb8e8ae1dd86be28b..8412c7be3bb09b94aaa6cd991fac4a3d1c3ffbf6
--- 1/arch/x86/xen/Kconfig
--- 2/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@@ -49,15 -49,3 +49,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

diff --cc arch/x86/xen/mmu.c
Simple merge

diff --cc drivers/block/xen-blkback/common.h
Simple merge

diff --cc drivers/xen/xen-pciback/xenbus.c
Simple merge