diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-27 14:11:07 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-27 14:11:07 +0100 |
| commit | 85c24cd8d3676cbae9e8809e894e68025c6d497e (patch) | |
| tree | 024c4b655c1a8e6943ed8e75b64be38980508cfe /tools/perf/scripts/python/event_analyzing_sample.py | |
| parent | ALSA: pcm: Avoid mmap warnings on x86 (diff) | |
| parent | ALSA: bebob: Uninitialized id returned by saffirepro_both_clk_src_get (diff) | |
| download | linux-85c24cd8d3676cbae9e8809e894e68025c6d497e.tar.gz linux-85c24cd8d3676cbae9e8809e894e68025c6d497e.zip | |
Merge branch 'for-linus' into for-next
Merged upstream branch to make further fireworks development easier
(and avoid conflicts earlier).
Conflicts:
sound/firewire/bebob/bebob_focusrite.c
Diffstat (limited to 'tools/perf/scripts/python/event_analyzing_sample.py')
0 files changed, 0 insertions, 0 deletions