summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-02-16 19:06:34 +0000
committerMark Brown <broonie@kernel.org>2017-02-16 19:06:34 +0000
commit442b38378cb1c71ec81f425a10711c9837188432 (patch)
tree8f411db7bf164ebf39fa949a299509d9c5efdd9e /sound/soc
parent73dab980cf70d0f23ec55de8a5c6403829551492 (diff)
parent9834ffd1ecc3a401d0ce64c2d4235a726da6d4f9 (diff)
parent80691c8f08b3b516df8833817dfdf15cfa1b9067 (diff)
parentb6e643adfd68258e16babaf36353c9668384350f (diff)
Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/pxa' and 'asoc/topic/qcom' into asoc-next