]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
projects / lisovros / qemu_apohw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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


Trivial merge
Virtual HW used in A0B36APO subject