]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 16a9602 ebc3226)
Merge tag 'kvm-s390-for-3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorPaolo Bonzini <pbonzini@redhat.com>
Thu, 15 May 2014 12:46:57 +0000 (14:46 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 15 May 2014 12:46:57 +0000 (14:46 +0200)
commita4e91d04b86504f145cc5f766c2609357a68b186
tree4578a55a253be7245ea294b68a07c82da820dfa4tree | snapshot
parent16a9602158861687c78b6de6dc6a79e6e8a9136fcommit | diff
parentebc3226202d5956a5963185222982d435378b899commit | diff
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
Linux kernel for KaRo TX COM modules