summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wm8960.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-30 15:58:56 +0100
committerMark Brown <broonie@kernel.org>2015-08-30 15:58:56 +0100
commit02dc14d66e2047ca2d1bc7ed8ebef7f3415cf476 (patch)
tree950dff81c68a752d6b43bfb3651dff23bc253b93 /sound/soc/codecs/wm8960.c
parent384ea7936cc987ee771690f624593f6dd8ca15a2 (diff)
parent84eac6196c4b3930fc81f9bcd76c4a1a2161fd34 (diff)
parentb970499878563437a43eab2dd2faa9217142fb98 (diff)
parent779ea47399bae5d9418451f5283a3b2e35869627 (diff)
parent3176bf2d7ccd64da9be7b07036e0ba8293179906 (diff)
parent85e7118412fea31464b62d00bcf4a65fa8904dcc (diff)
Merge remote-tracking branches 'asoc/topic/wm8741', 'asoc/topic/wm8753', 'asoc/topic/wm8904', 'asoc/topic/wm8960' and 'asoc/topic/wm8983' into asoc-next