]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 04:22:07 +0000 (14:22 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 04:22:07 +0000 (14:22 +1000)
commitc63605cb21a14df840bd55563019b48fef0808e6
tree4bc249ea549a983605e46141f54f2f354f131c6e
parentea051de2efa8f1f4a49e37e3e93a7dcec0cf111d
parent9a7819774e4236e8736a074b7e85276967911924
Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
arch/s390/include/asm/processor.h
arch/s390/include/asm/processor.h
arch/s390/kernel/dis.c
arch/s390/kvm/Kconfig
arch/x86/Kconfig
arch/x86/kernel/Makefile
arch/x86/kvm/x86.c
virt/kvm/kvm_main.c