From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Fri, 20 Jul 2012 15:14:03 +0000 (-0700)
Subject: Merge branch 'uek2-merge' of git://ca-git.us.oracle.com/linux-konrad-public
X-Git-Tag: v2.6.39-400.9.0~488
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e54d1bb67c18376c7c4624db20c74a196ec4afe6;p=users%2Fjedix%2Flinux-maple.git

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

Conflicts:
	arch/x86/xen/enlighten.c
---

e54d1bb67c18376c7c4624db20c74a196ec4afe6
diff --cc arch/x86/xen/enlighten.c
index 35dcd92f4695,e7e9ed3a27c3..5dbdd99925cc
--- a/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>