From: Blue Swirl <blauwirbel@gmail.com>
Date: Wed, 4 Apr 2012 20:45:03 +0000 (+0000)
Subject: Merge branch 's390-for-upstream' of git://repo.or.cz/qemu/agraf
X-Git-Tag: v1.1-rc0~150
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8f8d364f2447e58768132fc10f48a67af371ee38;p=users%2Fdwmw2%2Fqemu.git

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

* 's390-for-upstream' of git://repo.or.cz/qemu/agraf:
  target-s390x: Update s390x_{tod,cpu}_timer() to use S390CPU
  target-s390x: QOM'ify CPU init
  target-s390x: QOM'ify CPU reset
  target-s390x: QOM'ify CPU
---

8f8d364f2447e58768132fc10f48a67af371ee38