]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/lalrae/tags/mips-20160513' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 13 May 2016 10:50:42 +0000 (11:50 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 13 May 2016 10:50:42 +0000 (11:50 +0100)
MIPS patches 2016-05-13

Changes:
* fix zeroing CP0.WatchLo registers in soft reset
* QOMify Jazz led

# gpg: Signature made Fri 13 May 2016 11:04:04 BST using RSA key ID 0B29DA6B
# gpg: Good signature from "Leon Alrae <leon.alrae@imgtec.com>"

* remotes/lalrae/tags/mips-20160513:
  hw/display: QOM'ify jazz_led.c
  target-mips: fix call to memset in soft reset code

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

Trivial merge