From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 3 Aug 2012 18:50:41 +0000 (-0500)
Subject: Merge remote-tracking branch 'aneesh/for-upstream' into staging
X-Git-Tag: v1.2.0-rc0~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aeb01d5f2c9a89c557adb0fb40bca15238f93124;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'aneesh/for-upstream' into staging

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

aeb01d5f2c9a89c557adb0fb40bca15238f93124