Merge branch 'ppc-next' of git://repo.or.cz/qemu/agraf
commit5db070eb1ab902572e46ed09e5947ffe504522bc
authorAurelien Jarno <aurelien@aurel32.net>
Mon, 23 May 2011 20:35:37 +0000 (23 22:35 +0200)
committerAurelien Jarno <aurelien@aurel32.net>
Mon, 23 May 2011 20:35:37 +0000 (23 22:35 +0200)
tree6bfd837872aad6fb3f07a283208befa1dbba1c39
parent05c8a1e423736006580e4dd2bd94d0faafc9afdc
parentdecb471488dd9e7e7ab9957f120cb501c4489f63
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