summaryrefslogtreecommitdiff
path: root/sound/soc/soc-topology.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-03-28 05:31:04 +0300
committerMark Brown <broonie@kernel.org>2018-03-28 05:31:04 +0300
commitec67b19f952ce8eb40b27260815c7eec2d23426e (patch)
treedb53fabe09a2368abd833a1d753ec0313fe05a09 /sound/soc/soc-topology.c
parent4ec7e204ea8bde75a55add9877b9ab3a9784aab1 (diff)
parentb154dc5d7631c0bd32e42992867953cfd05bffd9 (diff)
parent68fb425baea14f5647743eb56dc6675fcd8d93b3 (diff)
parentcd21ac8c161ac2a88422387298b30e33ab29012c (diff)
parent05bdcf12905533b8628627b6634608cd3b57c607 (diff)
parentc3fd6a1d1a133d191e6fb09d0fe277330f35c525 (diff)
downloadlinux-ec67b19f952ce8eb40b27260815c7eec2d23426e.tar.xz
Merge remote-tracking branches 'asoc/topic/tlv320aic32x4', 'asoc/topic/tlv320aic3x', 'asoc/topic/tlv320dac33', 'asoc/topic/topology' and 'asoc/topic/tscs42xx' into asoc-next