Merge branch 'uek2-merge' of git://ca-git.us.oracle.com/linux-konrad-public

Conflicts:
	arch/x86/xen/enlighten.c

diff --cc arch/x86/xen/enlighten.c
index 35dcd92f46954945b4d31ace789e16687ce35532,e7e9ed3a27c3ee542376e1c2bfa4b04dea36a160..5dbdd99925cc128c4a26e9f6dbc0ef3afe74eb86
--- 1/arch/x86/xen/enlighten.c
--- 2/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@@ -31,7 -31,7 +31,8 @@@
  #include <linux/pci.h>
  #include <linux/gfp.h>
  #include <linux/memblock.h>
 +#include <linux/kexec.h>
+ #include <linux/syscore_ops.h>
  
  #include <xen/xen.h>
  #include <xen/interface/xen.h>

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