summaryrefslogtreecommitdiff
path: root/sound/soc/pxa
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-09-01 12:12:52 +0100
committerMark Brown <broonie@kernel.org>2017-09-01 12:12:52 +0100
commitbf3cc310a23defb31e23c3f062b335178c8a603f (patch)
tree2220069634ec0289e300754bf630235120e1642b /sound/soc/pxa
parentaf4f47717ff17cf81710cbd5dd78f11705204b88 (diff)
parent27bfda02662152f5e0d17731063cfcb342904b58 (diff)
parentda61a11823395c87db0471d8d54055fa5a961688 (diff)
parentd7622fa715f20dbc7c1ab0dbdd714be5a2b4c3bd (diff)
Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/psc-ac97' and 'asoc/topic/pxa' into asoc-next