summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-22 10:24:31 +0100
committerMark Brown <broonie@kernel.org>2015-06-22 10:24:31 +0100
commit861fe717256e7fe2d091d4676a611e6ea2496b15 (patch)
treeafd0dd63add0096c4ca69c46abcebca7164e96f2 /sound/soc
parentdacdd369113cb7ba91b8e70b09456ca6cdcc2184 (diff)
parent662e8d917f685011a24492c106737ea5fdff8136 (diff)
parentb43fccf4b5cae58829abbeae497a98505fa1a5e9 (diff)
parent6876c7c884b9115111768f2824138533ad8490da (diff)
downloadlinux-861fe717256e7fe2d091d4676a611e6ea2496b15.tar.bz2
Merge remote-tracking branches 'asoc/topic/mediatek', 'asoc/topic/ml26124' and 'asoc/topic/omap' into asoc-next