diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2014-05-15 14:46:57 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-05-15 14:46:57 +0200 |
| commit | a4e91d04b86504f145cc5f766c2609357a68b186 (patch) | |
| tree | 4578a55a253be7245ea294b68a07c82da820dfa4 /tools/perf/scripts/python/syscall-counts.py | |
| parent | KVM: x86: disable master clock if TSC is reset during suspend (diff) | |
| parent | KVM: s390: announce irqfd capability (diff) | |
| download | linux-dev-a4e91d04b86504f145cc5f766c2609357a68b186.tar.xz linux-dev-a4e91d04b86504f145cc5f766c2609357a68b186.zip | |
Merge tag 'kvm-s390-for-3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master
Here is a fix that aligns the irqfd code changes for 3.15
with the right capability number. irqfd for s390x was
introduced with 3.15-rc1, so this fix should still go into
Linus tree for 3.15
Diffstat (limited to 'tools/perf/scripts/python/syscall-counts.py')
0 files changed, 0 insertions, 0 deletions