From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 22 Jul 2011 16:07:08 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into staging
X-Git-Tag: v0.15.0-rc0~37
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bb5df884db32114a4a0129c9927793ebcf7c089a;p=users%2Fdwmw2%2Fqemu.git

Merge remote-tracking branch 'origin/master' into staging
---

bb5df884db32114a4a0129c9927793ebcf7c089a