diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-15 14:37:38 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-15 14:37:38 +0400 |
| commit | 743c5bb898be45009770c144e5e14e4f448e56b9 (patch) | |
| tree | 40fff57c975f89da4a90922c165595840e99093a /sound/soc/codecs/wm9713.c | |
| parent | 8fe120b5a665fc869c23f86e4964b801f6e53486 (diff) | |
| parent | b7ae6f31d8243ec684af16bc5c763eccdfabaec0 (diff) | |
| download | linux-743c5bb898be45009770c144e5e14e4f448e56b9.tar.xz | |
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 'sound/soc/codecs/wm9713.c')
0 files changed, 0 insertions, 0 deletions