tree 084340e39cd15d1246c9f43cfc1becd5582d5f12
parent 11c7ef0c737f37a487f45c6f3aa070ac7e342e3e
parent b2123a48566ab0636b78dda6b9c37c54bff69e6b
author Anthony Liguori <aliguori@us.ibm.com> 1325693185 -0600
committer Anthony Liguori <aliguori@us.ibm.com> 1325693185 -0600

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