From: Blue Swirl <blauwirbel@gmail.com>
Date: Sun, 24 Jun 2012 10:45:55 +0000 (+0000)
Subject: Merge branch 's390-for-upstream' of git://repo.or.cz/qemu/agraf
X-Git-Tag: v1.2.0-rc0~251
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8dacfcb407aa83664bd875123d2ec86612758c22;p=thirdparty%2Fqemu.git

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

* 's390-for-upstream' of git://repo.or.cz/qemu/agraf:
  s390: stop target cpu on sigp initial reset
  s390: make kvm_stat work on s390
  kvm: Update kernel headers
  s390x: fix s390 virtio aliases
---

8dacfcb407aa83664bd875123d2ec86612758c22