summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-22 10:24:36 +0100
committerMark Brown <broonie@kernel.org>2015-06-22 10:24:36 +0100
commite12be671ad4dcc4be7ef9511a3759fb8f3b5857f (patch)
treef080c5eae82b87a1f2e23a90d4811fb11aaaf97a /sound
parente39f6bc7de3d7c60ecdb43e45814470a8f600679 (diff)
parentef5294fd250adc8c340ffeb410b62e1b777ddf6f (diff)
parente369bd006fd67f981d64cf526c4a8b51438fffb2 (diff)
Merge remote-tracking branches 'asoc/topic/wm8523' and 'asoc/topic/wm8741' into asoc-next