diff options
author | Mark Brown <broonie@kernel.org> | 2014-12-08 13:11:40 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-12-08 13:11:40 +0000 |
commit | 063e01a29b7a8a74b622dd586831e2de6cce8064 (patch) | |
tree | f697bfc19b8fe99c1b244ac295cfa74618a11011 /sound/soc/codecs/cs42l51.h | |
parent | 6980a317356cdca536731d8e930bc07d59b2d265 (diff) | |
parent | 00e4c3b6e285da90e736fbefff3d9e74a200ee54 (diff) | |
parent | d742b925244ce91f16d380befdca473e4536359b (diff) | |
parent | 418382f29d99f1faffdd6636f378da41b44815db (diff) | |
parent | 50c0f21b42dd4cd02b51f82274f66912d9a7fa32 (diff) | |
parent | bbc686b34650b0f54affe9d9a637ccbe02b03760 (diff) |
Merge remote-tracking branches 'asoc/fix/adsp', 'asoc/fix/davinci', 'asoc/fix/max98090', 'asoc/fix/sigmadsp' and 'asoc/fix/tlv320aic31xx' into asoc-linus