summaryrefslogtreecommitdiff
path: root/sound/soc/pxa
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-12-12 15:52:58 +0000
committerMark Brown <broonie@kernel.org>2016-12-12 15:52:58 +0000
commitfba3040105d878d44b485cc337a4097788712013 (patch)
tree9eed20903b2e6ffea87d6d6c75a20f6103cabc24 /sound/soc/pxa
parenta3d91900a69b7fc840a55461c9105762bd4cde87 (diff)
parent852801417a89375c0df4285e60d90c7821a1d730 (diff)
parent5841ce10154e40151dd82eedf3e22e588d87c18b (diff)
parentefd95c71f4892ad5d0d33099db25085763f4c6c3 (diff)
parentb3af6d3f966a86cc556f5048fe6fff4e8cf567bc (diff)
Merge remote-tracking branches 'asoc/topic/dpcm', 'asoc/topic/es8328', 'asoc/topic/extcon' and 'asoc/topic/fsl' into asoc-next