| commit | 743c5bb898be45009770c144e5e14e4f448e56b9 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Thu Aug 15 11:37:38 2013 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Thu Aug 15 11:37:38 2013 +0100 |
| tree | 40fff57c975f89da4a90922c165595840e99093a | |
| parent | 8fe120b5a665fc869c23f86e4964b801f6e53486 [diff] | |
| parent | b7ae6f31d8243ec684af16bc5c763eccdfabaec0 [diff] |
Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-omap Conflicts: sound/soc/omap/Kconfig