]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 90c66f5 b957a1b)
Merge remote-tracking branch 'rth/axp-next' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 22 Jul 2013 15:13:27 +0000 (10:13 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 22 Jul 2013 15:13:27 +0000 (10:13 -0500)
# By Richard Henderson
# Via Richard Henderson
* rth/axp-next:
  pc-bios: Update palcode-clipper
  target-alpha: Move alarm to vm_clock

Message-id: 1374161033-11449-1-git-send-email-rth@twiddle.net
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Trivial merge
Qemu copy for testing