]> 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, 4 Apr 2013 03:28:35 +0000 (14:28 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Apr 2013 03:28:35 +0000 (14:28 +1100)
commitb70aca80a5c359576d83eba3e2b089b9d95bf76d
treede84e1b9d59599192fb52abb2fb3e14dabd2ac31
parent6a545f6f1e4be3776daac3d5244594e036ba1afd
parent81f4f76bbc712a2dff8bb020057c554e285370e1
Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
drivers/s390/kvm/virtio_ccw.c
arch/arm/kvm/arm.c
arch/powerpc/kvm/book3s_pr.c
drivers/s390/kvm/virtio_ccw.c
include/linux/kvm_host.h
virt/kvm/kvm_main.c