]> git.proxmox.com Git - qemu.git/commit
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)
commitaeb01d5f2c9a89c557adb0fb40bca15238f93124
tree04a96e4b5338adb8421afe55f5758529581f44bd
parentc8057f951d64de93bfd01569c0a725baa9f94372
parent4cdc0789ec17ce1ce48506cae62035310e932a2e
Merge remote-tracking branch 'aneesh/for-upstream' into staging

* aneesh/for-upstream:
  hw/9pfs: Fix assert when disabling migration
  configure: Fix build with capabilities