]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
Merge remote-tracking branch 'mcayland/tags/qemu-sparc-signed' into staging
authorStefan Hajnoczi <stefanha@redhat.com>
Mon, 8 May 2017 16:43:15 +0000 (12:43 -0400)
committerStefan Hajnoczi <stefanha@redhat.com>
Mon, 8 May 2017 16:43:22 +0000 (12:43 -0400)
qemu-sparc update

# gpg: Signature made Fri 05 May 2017 04:51:46 AM EDT
# gpg:                using RSA key 0x5BC2C56FAE0F321F
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C  C9C4 5BC2 C56F AE0F 321F

* mcayland/tags/qemu-sparc-signed:
  cg3: add explicit ram_addr_t cast to scanline page variable
  tcx: fix cut/paste error in update_palette_entries()

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Trivial merge