]> xenbits.xensource.com Git - people/liuw/qemu.git/commitdiff
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 7 Jan 2016 13:33:19 +0000 (13:33 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 7 Jan 2016 13:33:19 +0000 (13:33 +0000)
qemu-sparc update

# gpg: Signature made Thu 07 Jan 2016 13:20:13 GMT using RSA key ID AE0F321F
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"

* remotes/mcayland/tags/qemu-sparc-signed:
  target-sparc: implement NPT timer bit
  sun4u: split NPT and INT_DIS accesses between timer and compare registers
  sun4u: split out NPT and INT_DIS into separate CPUTimer fields

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge