diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-08 13:54:33 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-08 13:54:33 +0000 |
| commit | 5a4cfce73b7b48bdbb4e816124e5fcf84bc58e59 (patch) | |
| tree | 0d84d5096b34bfb794b52dc59271c184e9d3e4ea /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | ASoC: Fix snd_soc_instantiate_card error path (diff) | |
| parent | ASoC: Correct WM8962 interrupt mask register read (diff) | |
| download | wireguard-linux-5a4cfce73b7b48bdbb4e816124e5fcf84bc58e59.tar.xz wireguard-linux-5a4cfce73b7b48bdbb4e816124e5fcf84bc58e59.zip | |
Merge branch 'for-2.6.37' into for-2.6.38
Conflicts:
sound/soc/soc-core.c
Axel's fix on two different branches.
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions