]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 20 Sep 2012 05:02:16 +0000 (15:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 20 Sep 2012 05:02:16 +0000 (15:02 +1000)
commitca05bed44b0b40af1cccb2e5ad19c9b2c11e6a94
tree8f82bb379d990cc55771f818e07d68762619e257
parentff137f0aab460df27febd36f0be244a205cd424d
parentecba9a52acdf20530d561b7634b80c35c308943a
Merge remote-tracking branch 'kvm/linux-next'

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