diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 09:30:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 09:30:08 -0700 |
| commit | 7dfb2d4069cc698da925327e8c2106852a0c77a2 (patch) | |
| tree | a4143d70c25365f21d46be44eda3bbb5eb98bc9f /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu (diff) | |
| parent | Merge branch 'fix/asoc' into for-linus (diff) | |
| download | linux-dev-7dfb2d4069cc698da925327e8c2106852a0c77a2.tar.xz linux-dev-7dfb2d4069cc698da925327e8c2106852a0c77a2.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: emu10k1 - delay the PCM interrupts (add pcm_irq_delay parameter)
ALSA: hda - Fix ALC680 base model capture
ASoC: Remove DSP mode support for WM8776
ALSA: hda - Add quirk for Dell Vostro 1220
ALSA: riptide - Fix detection / load of firmware files
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions