From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 17 Jul 2017 14:43:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/audio-20170717-pull-request' into... 
X-Git-Tag: pull-nvme-20200902~2398
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=63dba7e6b18aa85392800f0cb7c897e3a05b097b;p=qemu-nvme.git

Merge remote-tracking branch 'remotes/kraxel/tags/audio-20170717-pull-request' into staging

audio: fixes for 2.10

# gpg: Signature made Mon 17 Jul 2017 10:29:08 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/audio-20170717-pull-request:
  audio/adlib: remove limitation of one adlib card
  audio/fmopl: modify timer callback to give opaque and channel parameters in two arguments
  audio: st_rate_flow exist a infinite loop

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

63dba7e6b18aa85392800f0cb7c897e3a05b097b