Merge tag 'kvm-s390-master-
20150303' of git://git./linux/kernel/git/kvms390/linux
KVM: s390: Fixups for changes in merge window for 4.0
Here are some fixups/improvements for
commit
658b6eda204 ("KVM: s390: add cpu model support")
commit
9d8d578605b ("KVM: s390: use facilities and cpu_id per KVM")
commit
a374e892c34 ("KVM: s390/cpacf: Enable/disable protected key
functions for kvm guest")
commit
45c9b47c588 ("KVM: s390/CPACF: Choose crypto control block format")
which all have been merged during the merge window for 4.0.