]> git.proxmox.com Git - mirror_qemu.git/commit
projects / mirror_qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 57f45b6 af87bf2)
Merge remote-tracking branch 'remotes/mcayland/qemu-sparc' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 4 Mar 2014 13:09:06 +0000 (13:09 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 4 Mar 2014 13:09:06 +0000 (13:09 +0000)
commitd47e95c0c86ea5d8d050bf201ee27bcec617c10e
treee6d50e9845e1778153c176903e7aadaa7399f9c8tree
parent57f45b6207a65d96ee4913f33f1ec46cd32a083acommit | diff
parentaf87bf290f31d8ef0aaf8f20259fa34e51ed1e7acommit | diff
Merge remote-tracking branch 'remotes/mcayland/qemu-sparc' into staging

* remotes/mcayland/qemu-sparc:
  sun4m: Add Sun CG3 framebuffer initialisation function
  sun4m: Add Sun CG3 framebuffer and corresponding OpenBIOS FCode ROM
  sun4m: fix slavio timer RUN/STOP bit
  sun4m: Set HostID in NVRAM

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Makefile diff1 | diff2 | blob | history
QEMU mirror