]> git.proxmox.com Git - qemu.git/commit
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7e68494 773de5c)
Merge remote-tracking branch 'agraf/s390-for-upstream-1.3' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 28 Nov 2012 19:19:16 +0000 (13:19 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 28 Nov 2012 19:19:16 +0000 (13:19 -0600)
commit0a6b2ac0cf92a4411cce38a22703d7a34a5b3601
tree517583dce5d47ccae0fde7f98ffd2d2f474b442ctree
parent7e68494b0be4310c48996e9334373ef5771e3d15commit | diff
parent773de5c786a6050bbf3b33c0e29d1bd519a40b4bcommit | diff
Merge remote-tracking branch 'agraf/s390-for-upstream-1.3' into staging

* agraf/s390-for-upstream-1.3:
  sclp: Fix uninitialized var in handle_write_event_buf().
  s390: Fix ram_size updating in machine init

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