]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 04:05:56 +0000 (14:05 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 04:05:56 +0000 (14:05 +1000)
commitb04707d3d87a6e9eb42457ca52c2aa498787201e
treec525703e7d2ca86c21e384b000436f8fa4903413
parentac7fb5869520f08e78a5c9709269b79857341cfb
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