diff options
author | Mark Brown <broonie@kernel.org> | 2016-12-12 18:53:03 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-12-12 18:53:03 +0300 |
commit | b8f04c19432624950be5a303679257cafbaa5b1a (patch) | |
tree | 511472d1e1d33ea11fb6633bd005bb402a1e942e /sound/soc/codecs/nau8825.h | |
parent | fba3040105d878d44b485cc337a4097788712013 (diff) | |
parent | 9a58725ba533b46db31d10a6dcc5ab7f9fa370ed (diff) | |
parent | 931afc4114c59b8fe8386db9fcdfe69a1322cae6 (diff) | |
parent | fa80b4eca6b383604da3a04f8c9de67bbb89f3b6 (diff) | |
parent | 5f1516d52f9287a94dc3b9d57c370ed01802a911 (diff) | |
download | linux-b8f04c19432624950be5a303679257cafbaa5b1a.tar.xz |
Merge remote-tracking branches 'asoc/topic/inntel', 'asoc/topic/input', 'asoc/topic/max98504' and 'asoc/topic/nau8825' into asoc-next