diff options
author | 2014-04-14 17:42:28 +0100 | |
---|---|---|
committer | 2014-04-14 17:42:28 +0100 | |
commit | aa0258adf6078a41a3db06f4e498253aff64d151 (patch) | |
tree | 26d293e3cd249d2946c6def872fa4bd88ed65669 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | ASoC: core: Allow snd_soc_update_bits use 32 bits register (diff) | |
parent | ASoC: Let snd_soc_platform subclass snd_soc_component (diff) | |
download | linux-dev-aa0258adf6078a41a3db06f4e498253aff64d151.tar.xz linux-dev-aa0258adf6078a41a3db06f4e498253aff64d151.zip |
Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-core
Conflicts:
sound/soc/soc-core.c
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions