diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-02-02 15:33:57 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-02-02 15:33:57 +0000 |
| commit | fabbd691fd7db2e71c6702089c9656e7047eac24 (patch) | |
| tree | 57b8c2b9a2e318cebc9c745bf4cb8b65bb490b13 /qga/main.c | |
| parent | 6a95e2586c55bddeb6439b5821a0ee5f28de4e8b (diff) | |
| parent | 8ec660b80ed511fa333679e38bf0cf714799d6fa (diff) | |
| download | qemu-fabbd691fd7db2e71c6702089c9656e7047eac24.zip | |
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) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# 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 <peter.maydell@linaro.org>
Diffstat (limited to 'qga/main.c')
0 files changed, 0 insertions, 0 deletions