From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 17 Mar 2014 11:21:35 +0000 (+0100)
Subject: Merge tag 'kvm-s390-20140317' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms39... 
X-Git-Tag: v3.15-rc1~118^2~17
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=94b3ffcd41a90d2cb0b32ca23aa58a01111d5dc0;p=linux.git

Merge tag 'kvm-s390-20140317' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

Two patches:
- one regression fix for reducing the amount of ucontrol userspace exits
- get rid of BUG_ONs in hot inner loops
---

94b3ffcd41a90d2cb0b32ca23aa58a01111d5dc0