diff options
author | Mark Brown <broonie@kernel.org> | 2015-12-23 00:23:27 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-12-23 00:23:27 +0000 |
commit | 3dd5fc0eeb5d7cc07b8e3e383037261799b38897 (patch) | |
tree | 44bc4d54b1cd7b8c7bf739e66f3c30a25ddbe4fd /sound/soc/fsl/fsl_sai.c | |
parent | 4ef7675344d687a0ef5b0d7c0cee12da005870c0 (diff) | |
parent | e2a0c9fa80227be5ee017b5476638829dd41cb39 (diff) | |
parent | 352d52e2442f42539c76d8a13d795ccab7079b26 (diff) | |
parent | 3e3f8bd569558acefdfaae273d71f7a29b8c0b4f (diff) | |
parent | 5042f936c6810d0e7153cc9e1794c6998590a930 (diff) | |
parent | c803cc2dcd722e08020c1ba63bb5ceece4a19fdb (diff) | |
parent | 1ea5998afe903384ddc16391d4c023cd4c867bea (diff) |
Merge remote-tracking branches 'asoc/fix/davinci', 'asoc/fix/es8328', 'asoc/fix/fsl-sai', 'asoc/fix/rockchip', 'asoc/fix/sgtl5000' and 'asoc/fix/wm8974' into asoc-linus