Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@kernel.org>
Wed, 25 Jul 2012 19:40:40 +0000 (21:40 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 25 Jul 2012 19:40:40 +0000 (21:40 +0200)
commitd431adfbc9b7de651f3164c6b7ffcad75805d7e4
tree29bce222c81a3a392e51c11e2188659aa6d1bded
parentd6250a3f12edb3a86db9598ffeca3de8b4a219e9
parente2b34e311be3a57c9abcb927e37a57e38913714c
Merge branch 'linus' into x86/urgent

Merge in Linus's tree to avoid a conflict.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/alternative.c