| commit | aa0258adf6078a41a3db06f4e498253aff64d151 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Mon Apr 14 17:42:28 2014 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Mon Apr 14 17:42:28 2014 +0100 |
| tree | 26d293e3cd249d2946c6def872fa4bd88ed65669 | |
| parent | 1a39019e939f620f39a1b914231ab6ba9013b208 [diff] | |
| parent | b37f1d123c69c0d7730704d65b83eaac780c0e3b [diff] |
Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-core Conflicts: sound/soc/soc-core.c