diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-20 12:36:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-20 12:36:02 +0100 |
| commit | 5aa664d63391c14f52264eb08d70f8a074ae249e (patch) | |
| tree | 539134746d006e25f1d893a3a170bb94388bd86e /tools/perf/scripts/python | |
| parent | 8735779774b8bbe14456c9e6ba4525eefc67a228 (diff) | |
| parent | c171b120c327e41278fc55d0b3d44be109dbf8c3 (diff) | |
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')
0 files changed, 0 insertions, 0 deletions