diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-06-06 12:47:37 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-06-06 12:47:37 +0100 |
| commit | 8625c3ffc883e8b5bcac345fa7ac5e9fec6fb593 (patch) | |
| tree | f809b98d8e18a5aa4f59d0e21fb4574f8dc2bd76 /hw/scsi/scsi-disk.c | |
| parent | b0491a1a17de0a32e2bc6a5ab2d79a657f8cb53e (diff) | |
| parent | 07b9098dfca4209ea1fca3cb26297164fcb4ae3c (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20160606-1' into staging
audio: pa volume fix, some qomifying.
# gpg: Signature made Mon 06 Jun 2016 08:01:21 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# 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-20160606-1:
hw/audio: QOM'ify milkymist-ac97.c
hw/audio: QOM'ify intel-hda
hw/audio: QOM cleanup for intel-hda
hw/audio: QOM'ify cs4231.c
audio: pa: Set volume of recording stream instead of recording device
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/scsi/scsi-disk.c')
0 files changed, 0 insertions, 0 deletions