From: Aurelien Jarno <aurelien@aurel32.net>
Date: Thu, 1 Nov 2012 15:42:49 +0000 (+0100)
Subject: Merge branch 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf
X-Git-Tag: v1.3.0-rc0~93
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46a3f234134a708883c4ace95d739f6226bb17f0;p=thirdparty%2Fqemu.git

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

* 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf:
  pseries: Cleanup duplications of ics_valid_irq() code
  pseries: Clean up inconsistent variable name in xics.c
  target-ppc: Extend FPU state for newer POWER CPUs
  target-ppc: Rework storage of VPA registration state
  Revert "PPC: pseries: Remove hack for PIO window"
---

46a3f234134a708883c4ace95d739f6226bb17f0