Merge branches 'x86/acpi', 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/mm', 'x86...
authorIngo Molnar <mingo@elte.hu>
Tue, 24 Feb 2009 20:50:43 +0000 (21:50 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 24 Feb 2009 20:50:43 +0000 (21:50 +0100)
commita852cbfaaf8122827602027b1614971cfd832304
tree1878756f936963822ed2d51a15db1da5814973e7
parent0d3a9cf5ab041c15691fd03dab3af0841af63606
parentecda06289f8202d4c6beb235f59ea464f4a91209
parent9f331119a4f95a44d918fe6d5e85998fabf99b72
parentbda3a89745d7bb88d3e735046c0cdc3d0eb2ac24
parentb319eed0aa0a6d710887350a3cb734c572aa64c4
parenta967bb3fbe640056bacb0357722f51676bb06e3c
parent954a8b8162ecab1d5ddf6c5b993b2d4da3fcaef7
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
Makefile
arch/x86/kernel/acpi/wakeup_64.S
arch/x86/kernel/cpu/mcheck/mce_intel_64.c
arch/x86/kernel/efi_stub_32.S
arch/x86/kernel/entry_64.S
arch/x86/kernel/traps.c
arch/x86/kernel/vmiclock_32.c