]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 03:50:54 +0000 (13:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 03:50:54 +0000 (13:50 +1000)
commitc2193bc65090c977075fbbd44fe7980ed861c1b4
treef0c297d475c0b0f9684868a186234ccd3aad4fc3
parent9a9b526b9791d338148d0b0fb4d6b544b6ee2037
parent1e08ec4a130e2745d96df169e67c58df98a07311
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