]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7be9ba b8ba679)
Merge branch 's390-for-upstream' of git://repo.or.cz/qemu/agraf
authorBlue Swirl <blauwirbel@gmail.com>
Wed, 4 Apr 2012 20:45:03 +0000 (20:45 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Wed, 4 Apr 2012 20:45:03 +0000 (20:45 +0000)
* '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


Trivial merge
Qemu copy for testing