| commit | 8bee1fd482622718fcc1a537db1d7ca48d7f52f8 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Tue May 13 18:23:56 2014 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Tue May 13 18:23:56 2014 +0100 |
| tree | 8b40cf912a942771b0b22f2aa0ac20d5af256010 | |
| parent | dfe1951b0c1c6a80b8ad8702eb93f8a4dffa31f1 [diff] | |
| parent | cffd6665f57ed18f4be9185c4330c8c98c22e201 [diff] |
Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel Conflicts: sound/soc/intel/sst-baytrail-dsp.c