From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 20 May 2015 09:46:12 +0000 (+0200)
Subject: Merge branch 'kvm-master' into kvm-next
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~138^2~66
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9b4fb7e79e7624c97c55e9c7562e3fe866ce70f;p=pandora-kernel.git

Merge branch 'kvm-master' into kvm-next

Grab MPX bugfix, and fix conflicts against Rik's adaptive FPU
deactivation patch.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

a9b4fb7e79e7624c97c55e9c7562e3fe866ce70f
Reading git-diff-tree failed