From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 28 Nov 2012 19:19:16 +0000 (-0600)
Subject: Merge remote-tracking branch 'agraf/s390-for-upstream-1.3' into staging
X-Git-Tag: v1.3.0-rc2~16
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0a6b2ac0cf92a4411cce38a22703d7a34a5b3601;p=qemu.git

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>
---

0a6b2ac0cf92a4411cce38a22703d7a34a5b3601