summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-02-19 16:37:07 +0000
committerMark Brown <broonie@kernel.org>2017-02-19 16:37:07 +0000
commit141dee78c40ac2c43aa4ff306688d625e1c731de (patch)
tree474813b50313c665d482968530de1bf8394c721a /sound/soc
parentebfa3dccd2ee17383e68b9c516c47068457a4de7 (diff)
parentaf4b654f9fa87cf66a06f4841074b6738ed58606 (diff)
parent66ead502af7de65d1e555189cdca8f47eddac400 (diff)
Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next