summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2015-05-20 11:46:12 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2015-05-20 12:31:37 +0200
commita9b4fb7e79e7624c97c55e9c7562e3fe866ce70f (patch)
treef690b927077f73993bc7e01c10fc47cce0460b85 /virt
parented3cf15271fa150320b46f03d369777b71786298 (diff)
parentc447e76b4cabb49ddae8e49c5758f031f35d55fb (diff)
downloadop-kernel-dev-a9b4fb7e79e7624c97c55e9c7562e3fe866ce70f.zip
op-kernel-dev-a9b4fb7e79e7624c97c55e9c7562e3fe866ce70f.tar.gz
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>
Diffstat (limited to 'virt')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud