diff options
author | 2009-02-19 08:35:29 -0800 | |
---|---|---|
committer | 2009-02-19 08:35:29 -0800 | |
commit | a1342d3b8e5dbffae9d5520e2847d7d605c25266 (patch) | |
tree | 303cfc0da68dfc8bbc74030640760c7857c7c6ae /kernel/trace/trace_branch.c | |
parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
parent | Merge branch 'fix/usb-audio' into for-linus (diff) | |
download | wireguard-linux-a1342d3b8e5dbffae9d5520e2847d7d605c25266.tar.xz wireguard-linux-a1342d3b8e5dbffae9d5520e2847d7d605c25266.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:
sound: virtuoso: revert "do not overwrite EEPROM on Xonar D2/D2X"
ALSA: jack - Use card->shortname for input name
ALSA: usb-audio - Workaround for misdetected sample rate with CM6207
ALSA: usb-audio - Fix non-continuous rate detection
sound: usb-audio: fix uninitialized variable with M-Audio MIDI interfaces
Revert "Sound: hda - Restore PCI configuration space with interrupts off"
Diffstat (limited to 'kernel/trace/trace_branch.c')
0 files changed, 0 insertions, 0 deletions