summaryrefslogtreecommitdiff
path: root/sound/soc/omap
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-11-10 21:31:20 +0000
committerMark Brown <broonie@kernel.org>2017-11-10 21:31:20 +0000
commit5b04644a48a5ba1c9c1b6561819c90f293d5b933 (patch)
tree9e81c56847db37384e0b5968ed60d492d601c867 /sound/soc/omap
parentc9e38f31a1e5ca14fb3d223d1dcaceeff574a3b0 (diff)
parentd6e18b8295593d8f59e92f6634577cbacae14629 (diff)
parentd4a8bce81cbd53420988f5db0d096ad04960f189 (diff)
parent79f01fe6262b0fbba4c558dfe3dd61b3c511a61a (diff)
parent94a6a8e8b57a8ece33b97a6dfc5f7eae61ff96f8 (diff)
Merge remote-tracking branches 'asoc/topic/max98925', 'asoc/topic/max98927', 'asoc/topic/msm8916' and 'asoc/topic/omap' into asoc-next