Merge branch 'linus' into x86/paravirt-spinlocks
authorIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 11:41:27 +0000 (13:41 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 11:41:27 +0000 (13:41 +0200)
commit2fb5e1e101d1b1c9a1aeca7ad99a02b49241ba7b
tree45c4575110c61ca181196c038e1579f0f4fb0174
parent34646bca474142e1424e5f6c4a33cb2ba0930ea1
parent5b664cb235e97afbf34db9c4d77f08ebd725335e
Merge branch 'linus' into x86/paravirt-spinlocks

Conflicts:

arch/x86/kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/Makefile
arch/x86/kernel/setup.c