diff options
| author | Mark Brown <broonie@kernel.org> | 2015-07-07 15:04:40 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-07-07 15:04:40 +0100 |
| commit | f2a763858a7d0236d658116918c7b1e2c7a5e0cf (patch) | |
| tree | cf86a7b3b2c9f5710506dfb940567f1750869c18 /tools/perf/scripts/python/syscall-counts-by-pid.py | |
| parent | 83c09290adfb025d9a109d9c3c2956c81bcb241b (diff) | |
| parent | 4890140f3888b4a4baef90d84e278858afe45248 (diff) | |
Merge branch 'topic/codec-dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rt5645
Conflicts:
sound/soc/codecs/rt5645.c
Diffstat (limited to 'tools/perf/scripts/python/syscall-counts-by-pid.py')
0 files changed, 0 insertions, 0 deletions