]> xenbits.xensource.com Git - qemu-upstream-4.5-testing.git/commitdiff
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)
* 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>

Trivial merge