]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fabb604 49e1587)
Merge remote-tracking branch 'agraf/s390-for-upstream' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 1 Feb 2013 15:06:23 +0000 (09:06 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 1 Feb 2013 15:06:23 +0000 (09:06 -0600)
# By Andreas Färber
# Via Alexander Graf
* agraf/s390-for-upstream:
  target-s390x: Pass S390CPU to s390_{add, del}_running_cpu()
  target-s390x: Clean up cpu_inject_*() signatures
  target-s390x: Fix debug output
  target-s390x: Fix debug output (continued)

1  2 
target-s390x/cpu.c patch | diff1 | diff2 | blob | history

diff --cc target-s390x/cpu.c
Simple merge
Qemu copy for testing