]> git.proxmox.com Git - qemu.git/commit
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 63fb259 5178234)
Merge remote-tracking branch 'qmp/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 14 Jan 2013 16:22:31 +0000 (10:22 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 14 Jan 2013 16:22:31 +0000 (10:22 -0600)
commit0054ee8c4168e7e298915baaa1a88d717e541bd3
treeac74674af1b30f580018123ecbc83980d09abc6ftree
parent63fb2590839162afdf14d7c0ee02d460766c0956commit | diff
parent517823449ebe8e3758b86c441cc74968b68e6491commit | diff
Merge remote-tracking branch 'qmp/queue/qmp' into staging

* qmp/queue/qmp:
  monitor: assert monitor_puts()'s loop invariant
  target-i386: fix bits 39:32 of the final physical address when using 4M page

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Qemu copy for testing