summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-09-29 12:44:21 -0700
committerMark Brown <broonie@kernel.org>2016-09-29 12:44:21 -0700
commit480d060b9e45c17933b2566401a2f1b12e7dc826 (patch)
tree5ecb2a425381d443e11781431644db32ee73e877 /include/sound
parentacf6470ab538402689f01b112d08471cfbb19e8b (diff)
parent72dce368926167811c10ef094deba524e1ca274f (diff)
parenta56a569818ea831ed2325dc5d1122dc0b8a229d0 (diff)
parent94d215cc6fc5f0a5d202ed2b12fa0b14392cc2e4 (diff)
Merge remote-tracking branches 'asoc/topic/da7218', 'asoc/topic/da7219' and 'asoc/topic/dpcm' into asoc-next