From: Peter Maydell Date: Fri, 2 Feb 2018 15:33:57 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/audio-20180202-pull-request' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fabbd691fd7db2e71c6702089c9656e7047eac24;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/audio-20180202-pull-request' into staging audio: two small fixes. # gpg: Signature made Fri 02 Feb 2018 07:49:20 GMT # gpg: using RSA key 4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/audio-20180202-pull-request: hw/audio/sb16.c: change dolog() to qemu_log_mask() hw/audio/wm8750: move WM8750 declarations from i2c/i2c.h to audio/wm8750.h Signed-off-by: Peter Maydell --- fabbd691fd7db2e71c6702089c9656e7047eac24