]> git.proxmox.com Git - mirror_qemu.git/commit
projects / mirror_qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9ca2140 a32134a)
Merge remote-tracking branch 'pmaydell/arm-devs.for-upstream' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 19 Jan 2012 15:19:44 +0000 (09:19 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 19 Jan 2012 15:19:44 +0000 (09:19 -0600)
commit5414b32542662976c364b58011c4841304569aff
tree1f74495ac9d2abf3bad4db049374dcb2b7986b70tree
parent9ca2140ab10a9fde4e60fb9499a733932d30386fcommit | diff
parenta32134aad891bd7b6cfa72b8f5ae2290bbe6fddacommit | diff
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
QEMU mirror