]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20151019-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 19 Oct 2015 09:06:56 +0000 (10:06 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 19 Oct 2015 09:06:56 +0000 (10:06 +0100)
commitaedc8806172dd1ae904f04169ee3b19fce1d7893
tree22136b7e0c7ce70ce507ecbbe3707130fed83baa
parent40fe17bea478793fc9106a630fa3610dad51f939
parent8307c294a355bbf3c5352e00877365b0cda66d52
Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20151019-1' into staging

Remove macros IO_READ_PROTO and IO_WRITE_PROTO

# gpg: Signature made Mon 19 Oct 2015 09:19:21 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-audio-20151019-1:
  Remove macros IO_READ_PROTO and IO_WRITE_PROTO

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