Merge remote-tracking branch 'sound/for-next'

diff --cc MAINTAINERS
Simple merge

diff --cc include/uapi/linux/virtio_ids.h
index b4f468e9441d14abb670f344f2d4335918f5c9e5,029a2e07a7f95a2482a29f484764d86ddce3f26a..f0c35ce8628c933991b1731692ef68efee44f680
--- 1/include/uapi/linux/virtio_ids.h
--- 2/include/uapi/linux/virtio_ids.h
+++ b/include/uapi/linux/virtio_ids.h
@@@ -51,9 -51,9 +51,10 @@@
  #define VIRTIO_ID_PSTORE              22 /* virtio pstore device */
  #define VIRTIO_ID_IOMMU                       23 /* virtio IOMMU */
  #define VIRTIO_ID_MEM                 24 /* virtio mem */
+ #define VIRTIO_ID_SOUND                       25 /* virtio sound */
  #define VIRTIO_ID_FS                  26 /* virtio filesystem */
  #define VIRTIO_ID_PMEM                        27 /* virtio pmem */
 +#define VIRTIO_ID_BT                  28 /* virtio bluetooth */
  #define VIRTIO_ID_MAC80211_HWSIM      29 /* virtio mac80211-hwsim */
  
  #endif /* _LINUX_VIRTIO_IDS_H */