diff options
author | 2015-03-09 18:59:50 -0700 | |
---|---|---|
committer | 2015-03-09 18:59:50 -0700 | |
commit | affb8172de395a6e1db52ed9790ca0456d8c29a9 (patch) | |
tree | 1415c9c6eabcde5d49a77a75dd71d073c33269e6 /net/can | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39... (diff) | |
parent | Merge tag 'kvm-s390-master-20150303' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
download | linux-affb8172de395a6e1db52ed9790ca0456d8c29a9.tar.gz linux-affb8172de395a6e1db52ed9790ca0456d8c29a9.tar.bz2 linux-affb8172de395a6e1db52ed9790ca0456d8c29a9.zip |
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull kvm/s390 bugfixes from Marcelo Tosatti.
* git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: s390: non-LPAR case obsolete during facilities mask init
KVM: s390: include guest facilities in kvm facility test
KVM: s390: fix in memory copy of facility lists
KVM: s390/cpacf: Fix kernel bug under z/VM
KVM: s390/cpacf: Enable key wrapping by default
Diffstat (limited to 'net/can')
0 files changed, 0 insertions, 0 deletions