diff options
| author | Ingo Molnar | 2008-08-25 10:54:07 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-08-25 10:54:07 +0200 |
| commit | e4f807c2b4d81636fc63993368646c5bfd42b22f (patch) | |
| tree | 2ff100911b1ba4e26e3d9aad41edb9b48405f01e /include/asm-x86/xen | |
| parent | x86: export pv_lock_ops non-GPL (diff) | |
| parent | Fix oops in acer_wmi driver (acer_wmi_init) (diff) | |
| download | kernel-qcow2-linux-e4f807c2b4d81636fc63993368646c5bfd42b22f.tar.gz kernel-qcow2-linux-e4f807c2b4d81636fc63993368646c5bfd42b22f.tar.xz kernel-qcow2-linux-e4f807c2b4d81636fc63993368646c5bfd42b22f.zip | |
Merge branch 'linus' into x86/xen
Conflicts:
arch/x86/kernel/paravirt.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/xen')
| -rw-r--r-- | include/asm-x86/xen/hypervisor.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-x86/xen/hypervisor.h b/include/asm-x86/xen/hypervisor.h index d9dd28caa508..fca066febc35 100644 --- a/include/asm-x86/xen/hypervisor.h +++ b/include/asm-x86/xen/hypervisor.h @@ -35,7 +35,6 @@ #include <linux/types.h> #include <linux/kernel.h> -#include <linux/version.h> #include <xen/interface/xen.h> #include <xen/interface/version.h> |