]> xenbits.xensource.com Git - osstest/qemu.git/commitdiff
projects / osstest / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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>
1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
osstest gate outputs for qemu