diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-13 19:21:09 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-13 19:21:09 +0100 |
| commit | 65fdd5c05a02b15bbfa5b0f4f050fdb25b9227f1 (patch) | |
| tree | d2a22f1ac24d8b4269e9011db83e1d3b1318408d /tools/perf/scripts/python/netdev-times.py | |
| parent | ASoC: Don't use codec->control_data in bulk write (diff) | |
| parent | ASoC: Remove unused and about to be broken SND_SOC_CUSTOM I/O bus (diff) | |
Merge branch 'for-3.0' into for-3.1
Trival fixup for move of I/O code into separate file.
Conflicts:
sound/soc/soc-cache.c
Diffstat (limited to 'tools/perf/scripts/python/netdev-times.py')
0 files changed, 0 insertions, 0 deletions