Merge branch 'topic/uek-4.1/xen' of git://ca-git.us.oracle.com/chander-public.git...

Conflicts:
	arch/x86/xen/enlighten.c

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/x86/xen/Kconfig
index bab11c6d79c9ea0ec6d6225de3520b03aa49aafc,005002d28389069fcb0dc0fe8d7ef8dd017bfa99..a6736985e9f0a4765ed2e0308f21fa2861198724
--- 1/arch/x86/xen/Kconfig
--- 2/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@@ -7,8 -7,9 +7,9 @@@ config XE
        depends on PARAVIRT
        select PARAVIRT_CLOCK
        select XEN_HAVE_PVMMU
+       select XEN_HAVE_VPMU
        depends on X86_64 || (X86_32 && X86_PAE)
 -      depends on X86_TSC
 +      depends on X86_LOCAL_APIC && X86_TSC
        help
          This is the Linux Xen port.  Enabling this will allow the
          kernel to boot in a paravirtualized environment under the

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

diff --cc drivers/net/xen-netback/xenbus.c
Simple merge

diff --cc drivers/xen/Kconfig
Simple merge