tree 1e472c25551774897e54b143bab3f463f31cda43
parent 1179ba539541347d5427cde8bcfdaa5ead14f3aa
parent 2a2f3e269c75edf916de5967079069aeb6a601cb
author Paolo Bonzini <pbonzini@redhat.com> 1392372607 +0100
committer Paolo Bonzini <pbonzini@redhat.com> 1392372607 +0100

Merge branch 'kvm-master' into kvm-queue