From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 12 Oct 2012 16:20:14 +0000 (-0500)
Subject: Merge remote-tracking branch 'pmaydell/arm-devs.for-upstream' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ae72f3f5391cc761665824eeea542d3c5ad7ca67;p=qemu.git

Merge remote-tracking branch 'pmaydell/arm-devs.for-upstream' into staging

* pmaydell/arm-devs.for-upstream:
  arm_gic: Rename gic_state to GICState
  zynq_slcr: Fixed ResetValues enum
  versatilepb: add gpio pl061 support
  hw/ds1338: Implement state save/restore
  hw/ds1338: Remove 'now' field from state struct
  hw/ds1338: Recapture current time when register pointer wraps around
  hw/ds1338: Fix mishandling of register pointer
  hw/arm_gic.c: Fix improper DPRINTF output.
  cadence_ttc: Fix 'clear on read' behavior
---

ae72f3f5391cc761665824eeea542d3c5ad7ca67