From: Anthony Liguori <aliguori@us.ibm.com>
Date: Thu, 19 Jan 2012 15:19:44 +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=5414b32542662976c364b58011c4841304569aff;p=qemu.git

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

* pmaydell/arm-devs.for-upstream:
  arm: make the number of GIC interrupts configurable
  hw/lan9118: Add save/load support
  arm: Remove incorrect comment in arm_timer
  vexpress, realview: Add (dummy) L2 cache controller
---

5414b32542662976c364b58011c4841304569aff