| commit | 287d414eacaa681413ea89adfa5b3a0d12d2ab1a | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Sun Jun 01 14:02:07 2014 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Sun Jun 01 14:02:07 2014 +0100 |
| tree | a4ef6c55bc2b2177f8a4144663c68e6e345b64cc | |
| parent | 432481220101166a0b33dc6f951b38a8af3d281c [diff] | |
| parent | 7b8751abdd34a2f924c37c29ad61d598f5d29e7b [diff] |
Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-fsl-ssi Conflicts: sound/soc/fsl/Kconfig