]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c8057f9 4cdc078)
Merge remote-tracking branch 'aneesh/for-upstream' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 3 Aug 2012 18:50:41 +0000 (13:50 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 3 Aug 2012 18:50:41 +0000 (13:50 -0500)
* aneesh/for-upstream:
  hw/9pfs: Fix assert when disabling migration
  configure: Fix build with capabilities


Trivial merge
Qemu copy for testing