Merge tag 'kvm-s390-20140117' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms39...
authorPaolo Bonzini <pbonzini@redhat.com>
Thu, 23 Jan 2014 10:38:13 +0000 (11:38 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 23 Jan 2014 10:38:13 +0000 (11:38 +0100)
commitc760f5e29d92adf5184589f1e616a4be146fb57c
treeeae46255f2a1633fc29df5430989f3cfbb799b40
parent0dc3fd0249a295863900984e02dd4bb89204205b
parent19e4735bd7f02bd38db43a8521377b35f236b3b6
Merge tag 'kvm-s390-20140117' of git://git./linux/kernel/git/kvms390/linux into kvm-queue

This deals with 2 guest features that need enablement in the kvm host:
- transactional execution
- lpp sampling support

In addition there is also a fix to the virtio-ccw guest driver. This will
enable future features
arch/s390/kvm/kvm-s390.c