diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-02-26 06:30:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-26 06:30:42 +0100 |
| commit | 13b2eda64d14d0a0c15c092664c7351ea58ea851 (patch) | |
| tree | e0c82eb79a20f515f37ab3ffb9e5039b531eaa8c /arch/x86/kernel | |
| parent | Merge branches 'x86/acpi', 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/mm', 'x86/signal' and 'x86/urgent'; commit 'v2.6.29-rc6' into x86/core (diff) | |
| parent | xen: disable interrupts early, as start_kernel expects (diff) | |
| download | linux-dev-13b2eda64d14d0a0c15c092664c7351ea58ea851.tar.xz linux-dev-13b2eda64d14d0a0c15c092664c7351ea58ea851.zip | |
Merge branch 'x86/urgent' into x86/core
Conflicts:
arch/x86/mach-voyager/voyager_smp.c
Diffstat (limited to 'arch/x86/kernel')
0 files changed, 0 insertions, 0 deletions