Merge tag 'kvm-s390-next-20150602' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 3 Jun 2015 12:51:02 +0000 (14:51 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 3 Jun 2015 12:51:02 +0000 (14:51 +0200)
commitf71f81d70a264ac9924deb9a95a7e0a4578e7648
tree40f4a46a03245644835d240a2b9fe9a33aab351a
parentb7e60c5aedd2b63f16ef06fde4f81ca032211bc5
parentea2cdd27dce66dc498c623adacd807ea3a350443
Merge tag 'kvm-s390-next-20150602' of git://git./linux/kernel/git/kvms390/linux into kvm-next

KVM: s390: Fix and cleanup for 4.2 (kvm/next)

One small fix for a commit targetted for 4.2 and one cleanup
regarding our printks.
arch/s390/kvm/kvm-s390.c