commit | 8db0d35bee8c7ea32591f33bf5aa97df454b3f6d | [log] [tgz] |
---|---|---|
author | Mark Brown <broonie@linaro.org> | Fri Mar 07 11:05:07 2014 +0800 |
committer | Mark Brown <broonie@linaro.org> | Fri Mar 07 11:05:07 2014 +0800 |
tree | 202ff8185e6aa7fbb7993d1c9b417c04b7d3234b | |
parent | d433570d9cac9c98de4c71b38d47b759f9168dea [diff] | |
parent | cc1bc54aa787c39125fe843e81bd693e8f507c32 [diff] |
Merge branch 'topic/tlv320aic23' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-fsl Conflicts: sound/soc/fsl/Kconfig