diff options
| author | Mark Brown <broonie@kernel.org> | 2016-08-24 10:32:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-08-24 10:32:41 +0100 |
| commit | f6ccdc44ddc8a619ae2898104d67ad4d3d469706 (patch) | |
| tree | da4ddc45263efb4d9faee293fd625f5d9301022e | |
| parent | 4e85e7776eba5f6d5a3b8b43f34001a73c5d08a1 (diff) | |
| parent | a8719670687c46ed2e904c0d05fa4cd7e4950cd1 (diff) | |
Merge branch 'fix/omap' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-omap