]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'x86/asm'
authorIngo Molnar <mingo@kernel.org>
Thu, 27 Jun 2013 14:19:37 +0000 (16:19 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 27 Jun 2013 14:19:37 +0000 (16:19 +0200)
1  2 
arch/x86/kvm/x86.c

Simple merge