tree 6bfd837872aad6fb3f07a283208befa1dbba1c39
parent 05c8a1e423736006580e4dd2bd94d0faafc9afdc
parent decb471488dd9e7e7ab9957f120cb501c4489f63
author Aurelien Jarno <aurelien@aurel32.net> 1306182937 +0200
committer Aurelien Jarno <aurelien@aurel32.net> 1306182937 +0200

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