diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-10 09:34:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-10 09:34:15 -0700 |
| commit | e1f38e2cea199ef2b8e117506fef8abbecbaae5e (patch) | |
| tree | de5156ac95281c229e2ec142d8b4dee18e399801 /tools/perf/util/trace-event-scripting.c | |
| parent | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| parent | Merge branch 'fix/misc' into for-linus (diff) | |
| download | linux-dev-e1f38e2cea199ef2b8e117506fef8abbecbaae5e.tar.xz linux-dev-e1f38e2cea199ef2b8e117506fef8abbecbaae5e.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: sound/spi: patch for the unuseful variable removal
ALSA: hda - Add SSID table for iMac7,1.
ALSA: hda - Add SSID table for MacBookAir1,1
ALSA: hda - Add SSID table for MacBookAir2,1
ALSA: atmel: set "channel A event" output to debug
Diffstat (limited to 'tools/perf/util/trace-event-scripting.c')
0 files changed, 0 insertions, 0 deletions