]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'x86/urgent'
authorIngo Molnar <mingo@kernel.org>
Wed, 25 Jul 2012 17:14:37 +0000 (19:14 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 25 Jul 2012 17:14:37 +0000 (19:14 +0200)
1  2 
arch/x86/kernel/alternative.c

Simple merge