From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 4 Jan 2012 16:06:25 +0000 (-0600)
Subject: Merge remote-tracking branch 'pmaydell/arm-devs.for-upstream' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c47f3223658119219bbe0b8d09da733d1c06e76f;p=qemu.git

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

* pmaydell/arm-devs.for-upstream:
  add L2x0/PL310 cache controller device
  arm: add dummy gic security registers
  arm: Set frequencies for arm_timer
  arm: add missing scu registers
  hw/omap_gpmc: Fix region map/unmap when configuring prefetch engine
  hw/omap1.c: Drop unused includes
  hw/omap1.c: Separate dpll_ctl from omap_mpu_state
  hw/omap1.c: Separate PWT from omap_mpu_state
  hw/omap1.c: Separate PWL from omap_mpu_state
  hw/omap1.c: omap_mpuio_init() need not be public
  hw/pl110.c: Add post-load hook to invalidate display
  hw/pl181.c: Add save/load support
---

c47f3223658119219bbe0b8d09da733d1c06e76f