summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/twl6040.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-04 20:57:24 +0000
committerMark Brown <broonie@kernel.org>2015-02-04 20:57:24 +0000
commitdacff834fa20b213c258175b7745a55eb35ea5b3 (patch)
treee9e3c7cd889ebcacd5abd554409102162ca5a883 /sound/soc/codecs/twl6040.c
parent801a5656daf664edba8d07212d70241bbf79d474 (diff)
parent691384503426f97f647e98eed85410eae71c2754 (diff)
parenta380acb88611e1ee90dcb3da39e05991cadc6682 (diff)
parent27ad02f3b6452e0b650835438eb10ba76cb7dfaf (diff)
parent4d4f175ac68207b0acd3c56c5e969d9d6d2887fb (diff)
Merge remote-tracking branches 'asoc/topic/txx9', 'asoc/topic/wm8750', 'asoc/topic/wm8804' and 'asoc/topic/wm8904' into asoc-next