From: Anthony Liguori <aliguori@us.ibm.com>
Date: Thu, 12 May 2011 13:08:12 +0000 (-0500)
Subject: Merge remote-tracking branch 'stefanha/trivial-patches' into staging
X-Git-Tag: v0.15.0-rc0~288
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=711c21280b2cb56060859cc574221a8bf40f908a;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

Conflicts:
	cpu-all.h
---

711c21280b2cb56060859cc574221a8bf40f908a