summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/da732x.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-10-06 12:49:07 +0100
committerMark Brown <broonie@kernel.org>2014-10-06 12:49:07 +0100
commit978d4ddb9ed2fe272d66219e109afe6e8eb090a9 (patch)
tree70e1b6b1b8a11127411ebd20811565d1d9eb810f /sound/soc/codecs/da732x.c
parent248519c00eb239adc9a4a33e9970ccfea335b83a (diff)
parent83a7fc98dc9c29c5d2d66c80fb50725303a78192 (diff)
parentbe1aa3ea1f4179cbc84c57d3b1128c49515910ac (diff)
parent9766a1cfe5ef2042d1e604e2223629dc43307a21 (diff)
parent9cfb76905da525579d0d43c1205c86033d0ae3e5 (diff)
parent31d9f8faf9a54c851e835af489c82f45105a442f (diff)
Merge remote-tracking branches 'asoc/topic/suspend', 'asoc/topic/tas2552', 'asoc/topic/tegra', 'asoc/topic/tlv320aic31xx' and 'asoc/topic/tlv320aic3x' into asoc-next