Merge branch 'linus' into cpus4096
commit1f3f424a6bee9de4d839be9951f4296333fac014
authorIngo Molnar <mingo@elte.hu>
Wed, 17 Dec 2008 12:07:48 +0000 (17 13:07 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 17 Dec 2008 12:07:48 +0000 (17 13:07 +0100)
tree95de90dfdb4a9f64fe470709b82176243537c952
parentc8cae544bba6aee0f5cb0756dbab1a71d2c68737
parent1bda71282ded6a2e09a2db7c8884542fb46bfd4f
Merge branch 'linus' into cpus4096
arch/x86/kernel/setup.c
arch/x86/kernel/smpboot.c