From: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu, 15 May 2014 12:46:57 +0000 (+0200)
Subject: Merge tag 'kvm-s390-for-3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a4e91d04b86504f145cc5f766c2609357a68b186;p=linux-beck.git

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
---

a4e91d04b86504f145cc5f766c2609357a68b186