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


Trivial merge