diff options
author | 2015-01-27 17:52:51 +0000 | |
---|---|---|
committer | 2015-01-27 17:52:51 +0000 | |
commit | a7834aa932e245a13fb2da59471672ca9bf3a7a5 (patch) | |
tree | b0176955acf09d94f1e6754b2b9653720cb50b45 /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | ASoC: Remove codec field from snd_soc_dapm_widget (diff) | |
parent | ASoC: rt286: Fix capture volume setting issue (diff) | |
download | wireguard-linux-a7834aa932e245a13fb2da59471672ca9bf3a7a5.tar.xz wireguard-linux-a7834aa932e245a13fb2da59471672ca9bf3a7a5.zip |
Merge branch 'topic/rt286' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-w-codec
Conflicts:
sound/soc/codecs/rt286.c
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions