From: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon, 23 May 2011 20:35:37 +0000 (+0200)
Subject: Merge branch 'ppc-next' of git://repo.or.cz/qemu/agraf
X-Git-Tag: v0.15.0-rc0~255
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5db070eb1ab902572e46ed09e5947ffe504522bc;p=thirdparty%2Fqemu.git

Merge branch 'ppc-next' of git://repo.or.cz/qemu/agraf

* 'ppc-next' of git://repo.or.cz/qemu/agraf:
  Fix a bug in mtsr/mtsrin emulation on ppc64
  pSeries: Clean up write-only variables
  w32: Fix compilation and replace non-portable usage of ulong
---

5db070eb1ab902572e46ed09e5947ffe504522bc