]> 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, 6 Sep 2012 04:06:32 +0000 (14:06 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Sep 2012 04:06:32 +0000 (14:06 +1000)
commit6e0e5d77973fa78fc09f4f52919e7e84ae9e8fe5
treedca24a022f1f0874485a6a60b62755abfbd894ab
parent86abdb8f381d98c29467ebf70431ae9d2d6b6140
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