summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-03-28 10:31:10 +0800
committerMark Brown <broonie@kernel.org>2018-03-28 10:31:10 +0800
commit7fa89d6132e5f865c47936262af122ace74aac94 (patch)
treee9e76d6862f48db55f1a91d0645b53827d4ea34e /sound
parentec67b19f952ce8eb40b27260815c7eec2d23426e (diff)
parentc68e7f5ba4fad7962e193414ad55749cbc008a17 (diff)
parent83eca9f5eda6efff71515cb9c1a373b26d2d4c5b (diff)
parent2ab7fb08fb0bd24841bd05a4e51a44b4672b34f9 (diff)
parentb40822d9e8bc7fe43de1c68ab3ea5a485ba6a4fa (diff)
parent7c3c20f2bec1e8bdaadd551a4b75f1834a7cb974 (diff)
Merge remote-tracking branches 'asoc/topic/twl4030', 'asoc/topic/twl6040', 'asoc/topic/uda134x', 'asoc/topic/uda1380' and 'asoc/topic/uniphier' into asoc-next