diff options
author | 2013-09-26 12:05:47 +0100 | |
---|---|---|
committer | 2013-09-26 12:05:47 +0100 | |
commit | e8f00c1b01c8b547bd1e11754634ce1913c7cc72 (patch) | |
tree | f50e57dc2ce4ca1a3f84b6c036c989b5491dc8c5 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | ASoC: mmp-sspa: Use devm_snd_soc_register_component (diff) | |
parent | ASoC: imx-sgtl5000: Fix uninitialized pointer use in error path (diff) | |
download | linux-dev-e8f00c1b01c8b547bd1e11754634ce1913c7cc72.tar.xz linux-dev-e8f00c1b01c8b547bd1e11754634ce1913c7cc72.zip |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-devm
Conflicts:
sound/soc/fsl/imx-sgtl5000.c
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions