diff options
| author |   Mark Brown <broonie@kernel.org> | 2015-02-05 20:18:39 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-05 20:18:39 +0000 |
| commit | 8a5b69017e1923ce467c6e0c6231e0882f4afe56 (patch) | |
| tree | cbb60d38560b6880ecea9bfc3460ecd80220d8fb /tools/perf/scripts/python/call-graph-from-postgresql.py | |
| parent | ASoC: Intel: fix sst firmware path (diff) | |
| parent | ASoC: Intel: fix sst firmware path for cht-bsw-rt5672 (diff) | |
| download | linux-dev-8a5b69017e1923ce467c6e0c6231e0882f4afe56.tar.xz linux-dev-8a5b69017e1923ce467c6e0c6231e0882f4afe56.zip | |
Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Conflicts:
sound/soc/intel/sst/sst_acpi.c
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions