]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99918ce 2fb70f6)
Merge branch 's390-for-upstream' of git://repo.or.cz/qemu/agraf
authorBlue Swirl <blauwirbel@gmail.com>
Sun, 24 Jun 2012 10:45:55 +0000 (10:45 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Sun, 24 Jun 2012 10:45:55 +0000 (10:45 +0000)
* '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

1  2 
hw/qdev-monitor.c patch | diff1 | diff2 | blob | history

diff --cc hw/qdev-monitor.c
Simple merge
Qemu copy for testing