diff options
author | 2014-10-20 12:36:02 +0100 | |
---|---|---|
committer | 2014-10-20 12:36:02 +0100 | |
commit | 5aa664d63391c14f52264eb08d70f8a074ae249e (patch) | |
tree | 539134746d006e25f1d893a3a170bb94388bd86e /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | ASoC: sgtl5000: Add MicBias voltage support (diff) | |
parent | ASoC: sgtl500: Document the required supplies (diff) | |
download | linux-dev-5aa664d63391c14f52264eb08d70f8a074ae249e.tar.xz linux-dev-5aa664d63391c14f52264eb08d70f8a074ae249e.zip |
Merge branch 'fix/sgtl5000' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-sgtl5000
Conflicts:
Documentation/devicetree/bindings/sound/sgtl5000.txt
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions