]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit89b06e37a46a5e3e40611d8f0e94b877a9acc1c4
tree29bce222c81a3a392e51c11e2188659aa6d1bded
parent2a5e193f223137a0f3f046e32f2c9f8edd0f7971
parent2612fa895c070f084257bb493dff3ae2b4fe1fa8
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