diff options
| author | Marcelo Tosatti <mtosatt@redhat.com> | 2015-03-05 20:42:48 +0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2015-03-05 20:42:48 +0300 |
| commit | bfb8fb4775d3397908ae3a7ff65807097d81d713 (patch) | |
| tree | 58ccc0442c3f862685e9110a7fbe5b735aebf102 /include/net/sch_generic.h | |
| parent | 6587457b4b3d663b237a0f95ddf6e67d1828c8ea (diff) | |
| parent | fb5bf93f84c277546473be35543ed7890f6e6742 (diff) | |
| download | linux-bfb8fb4775d3397908ae3a7ff65807097d81d713.tar.xz | |
Merge tag 'kvm-s390-master-20150303' of git://git.kernel.org/pub/scm/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.
Diffstat (limited to 'include/net/sch_generic.h')
0 files changed, 0 insertions, 0 deletions