summary refs log tree commit diff stats
path: root/tests/test-io-channel-socket.c
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2017-05-08 12:43:15 -0400
committerStefan Hajnoczi <stefanha@redhat.com>2017-05-08 12:43:22 -0400
commit2fd463854cbf7e649ef9c9be86d2694b5d4a53e3 (patch)
tree44434ec9da33254e3faca7546099ffc56fc36397 /tests/test-io-channel-socket.c
parent6225820136f8c745c71290a904da61114d766253 (diff)
parent8eb57ae3f9afdd8d911f3b2862e05cd0bb042b4e (diff)
downloadfocaccia-qemu-2fd463854cbf7e649ef9c9be86d2694b5d4a53e3.tar.gz
focaccia-qemu-2fd463854cbf7e649ef9c9be86d2694b5d4a53e3.zip
Merge remote-tracking branch 'mcayland/tags/qemu-sparc-signed' into staging
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>
Diffstat (limited to 'tests/test-io-channel-socket.c')
0 files changed, 0 insertions, 0 deletions