From: Peter Maydell Date: Thu, 7 Jan 2016 13:33:19 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=263699432c90dab31eb8ab6ee0671458322e3d1e;p=qemu.git Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into staging 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 " * 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 --- 263699432c90dab31eb8ab6ee0671458322e3d1e