[Xen-changelog] merge

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID dc27fd3392b1d8c149c71f2ef63534d4e3a32853
# Parent  48da5e50658973b32415a37da2087e751a12c825
# Parent  6f6ed46897950be6277549e5b6a9546571b6af78
merge

diff -r 48da5e506589 -r dc27fd3392b1 
linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/pgtable.h
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/pgtable.h Sat Aug 13 
22:04:22 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/pgtable.h Sun Aug 14 
08:09:06 2005
@@ -9,6 +9,7 @@
 #include <asm/fixmap.h>
 #include <asm/bitops.h>
 #include <linux/threads.h>
+#include <linux/sched.h>
 #include <asm/pda.h>
 #ifdef CONFIG_XEN
 #include <asm-xen/hypervisor.h>

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog