diff options
author | 2014-06-01 14:02:07 +0100 | |
---|---|---|
committer | 2014-06-01 14:02:07 +0100 | |
commit | 287d414eacaa681413ea89adfa5b3a0d12d2ab1a (patch) | |
tree | a4ef6c55bc2b2177f8a4144663c68e6e345b64cc /tools/perf/scripts/python/export-to-postgresql.py | |
parent | ASoC: fsl-ssi: Use regmap (diff) | |
parent | ASoC: fsl: Remove dependencies of boards for SND_SOC_EUKREA_TLV320 (diff) | |
download | linux-dev-287d414eacaa681413ea89adfa5b3a0d12d2ab1a.tar.xz linux-dev-287d414eacaa681413ea89adfa5b3a0d12d2ab1a.zip |
Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-fsl-ssi
Conflicts:
sound/soc/fsl/Kconfig
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions