diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-15 11:37:38 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-15 11:37:38 +0100 |
| commit | 743c5bb898be45009770c144e5e14e4f448e56b9 (patch) | |
| tree | 40fff57c975f89da4a90922c165595840e99093a /tools/perf/scripts/python | |
| parent | ASoC: omap-abe-twl6040: Remove support for pdata (legacy boot) (diff) | |
| parent | ALSA: move dmaengine implementation from ASoC to ALSA core (diff) | |
| download | linux-743c5bb898be45009770c144e5e14e4f448e56b9.tar.gz linux-743c5bb898be45009770c144e5e14e4f448e56b9.zip | |
Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-omap
Conflicts:
sound/soc/omap/Kconfig
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions