Merge branch 'x86/alternatives' into x86/core
authorIngo Molnar <mingo@elte.hu>
Fri, 5 Sep 2008 15:03:17 +0000 (17:03 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 5 Sep 2008 15:03:17 +0000 (17:03 +0200)
commit0a328ea43da9c3eefce7cb6c947e43e1a0fef810
treef591798a923d07ef0cc8e89a595570e205f094fa
parentd3d0ba7b8fb8f57c33207adcb41f40c176148c03
parent5bbd4c3724008c93cf3efdfc38a3402e245ab506
Merge branch 'x86/alternatives' into x86/core
arch/x86/kernel/alternative.c
include/asm-x86/futex.h
include/asm-x86/spinlock.h