diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-02 10:00:35 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-02 10:00:35 -0700 |
| commit | eba17e6868059849fc2ffa79aabdd5b59f229fb9 (patch) | |
| tree | 25c40aff5f46f9de63b331be410fda46a5dddbcb /tools/perf/scripts/python | |
| parent | ASoC: cs42l51: Fix mask for REVID (diff) | |
| parent | ASoC: Remove IS_ENABLED for INPUT in CS42L52 and WM8962 (diff) | |
| download | linux-eba17e6868059849fc2ffa79aabdd5b59f229fb9.tar.gz linux-eba17e6868059849fc2ffa79aabdd5b59f229fb9.zip | |
Merge branch 'topic/input' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-cs42l51
Conflicts:
sound/soc/codecs/Kconfig
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions