Merge commit '33b458d276bb' into kvm-master
authorPaolo Bonzini <pbonzini@redhat.com>
Mon, 30 Jun 2014 14:45:40 +0000 (16:45 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 30 Jun 2014 14:45:40 +0000 (16:45 +0200)
commit9a630d15f16dbe4fec7ef5a4bc570cd46774a968
treeba6cf978a3b0a7389e7b5cf1244831ccd352f501
parent0c2363ffec4d99f8602f94d5b3f7747fe54ab679
parent33b458d276bbdbe28febac0742835002b9f4778d
Merge commit '33b458d276bb' into kvm-master