]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'x86/asm'
authorIngo Molnar <mingo@kernel.org>
Thu, 23 Aug 2012 08:45:41 +0000 (10:45 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 23 Aug 2012 08:45:41 +0000 (10:45 +0200)
1  2 
arch/x86/kernel/alternative.c
kernel/cpu.c

Simple merge
diff --cc kernel/cpu.c
Simple merge