summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-03-28 10:28:30 +0800
committerMark Brown <broonie@kernel.org>2018-03-28 10:28:30 +0800
commitcce67af3b85047c4c77de3183d08ddc92417a121 (patch)
tree23496f36f50c52cdf17fcb1f717fafc2c76b11e7 /include/sound
parent848272e9a38e78bf0c746774a93ed2ab0a5b7f13 (diff)
parent5783994b9afa8d37e9766b3cfbb594c1ae26087c (diff)
parentaeb90fd2e1cbc17a336c8e76d8e75d57722de932 (diff)
parent6aa89ef38d7123b35747af058f43eb7c1a70042e (diff)
parent683adc821182c148ce973c2cc0a9a508e26545ec (diff)
parent89cea5c9a9f3dc487f39997801ff5191f2375369 (diff)
Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/ab8500', 'asoc/topic/ac97', 'asoc/topic/ad1836' and 'asoc/topic/ad193x' into asoc-next