From: Blue Swirl <blauwirbel@gmail.com>
Date: Sat, 19 Jan 2013 09:55:46 +0000 (+0000)
Subject: Merge branch 's390-for-upstream' of git://repo.or.cz/qemu/agraf
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=67c4f2d0e11de8ee534b17edafbcbcdcca4b0e9b;p=qemu.git

Merge branch 's390-for-upstream' of git://repo.or.cz/qemu/agraf

* 's390-for-upstream' of git://repo.or.cz/qemu/agraf:
  s390: Add a hypercall registration interface.
  target-s390x: Unregister reset callback on finalization
  s390x: fix indentation
  s390: Add CPU reset handler
  s390x: Remove inline function ebcdic_put and related data from cpu.h
  S390: Enable -cpu help and QMP query-cpu-definitions
  s390: Move IPL code into a separate device
  s390: new contributions GPLv2 or later
---

67c4f2d0e11de8ee534b17edafbcbcdcca4b0e9b