diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-08-25 10:54:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-25 10:54:07 +0200 |
| commit | e4f807c2b4d81636fc63993368646c5bfd42b22f (patch) | |
| tree | 2ff100911b1ba4e26e3d9aad41edb9b48405f01e /arch/x86/kernel/process_64.c | |
| parent | x86: export pv_lock_ops non-GPL (diff) | |
| parent | Fix oops in acer_wmi driver (acer_wmi_init) (diff) | |
| download | linux-dev-e4f807c2b4d81636fc63993368646c5bfd42b22f.tar.xz linux-dev-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 'arch/x86/kernel/process_64.c')
0 files changed, 0 insertions, 0 deletions