summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/ak4642.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-12 19:48:51 +0100
committerMark Brown <broonie@kernel.org>2015-04-12 19:48:51 +0100
commit6ca4aba43e52b0743c28a9fa7d550b96df63b4f0 (patch)
treeee5332c6d9b5dd4c8667b0e93bbc7a9b0d4c6062 /sound/soc/codecs/ak4642.c
parent7ad2d1d5b069ce658d9c646c55278e161036dfca (diff)
parentf7d4bfee667e236bc9680cfe2f17247bc007f4e3 (diff)
parentb3f5dbec2f077be7ee392da3365d11e393a50038 (diff)
parent39c26180641da983269d5f24f124f8624f2587b4 (diff)
parent158bf4ed7f686f92ea6c046c5d9d04afad92eb17 (diff)
parentada602b30e070e786caa6e14a2e17100c6bd6998 (diff)
Merge remote-tracking branches 'asoc/topic/4554', 'asoc/topic/ab8500', 'asoc/topic/ak4642', 'asoc/topic/arizona' and 'asoc/topic/atmel' into asoc-next