]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3d6ca7 ad37ad5)
Merge remote-tracking branch 'pmaydell/target-arm.for-upstream' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 10 May 2012 13:30:55 +0000 (08:30 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 10 May 2012 13:30:55 +0000 (08:30 -0500)
* pmaydell/target-arm.for-upstream:
  target-arm/cpu.h: Make cpu_init("nonexistent cpu") return NULL
  target-arm: When setting FPSCR.QC, don't clear other FPSCR bits


Trivial merge
Qemu copy for testing