diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-03 10:14:59 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-03 10:14:59 -0800 |
commit | 20ebc0073b0fb63ce4a27ca761418ecfdecaadb7 (patch) | |
tree | e536365120ae7ec3d8622e75d847c44460dc84f1 /kernel/trace/ring_buffer.c | |
parent | c8126cc6025972629044cde750cec97f175792f7 (diff) | |
parent | 7aeb6d7d20185b7cede1ce5f6bd8d762e49bda6d (diff) |
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: hda: make a STAC_DELL_EQ option
ALSA: emu10k1 - Add more invert_shared_spdif flag to Audigy models
ALSA: hda - Add a quirk for another Acer Aspire (1025:0090)
ALSA: remove direct access of dev->bus_id in sound/isa/*
sound: struct device - replace bus_id with dev_name(), dev_set_name()
ALSA: Fix PIT lockup on some chipsets when using the PC-Speaker
ALSA: rawmidi - Add open check in rawmidi callbacks
ALSA: hda - Add digital-mic for ALC269 auto-probe mode
ALSA: hda - Disable broken mic auto-muting in Realtek codes
Diffstat (limited to 'kernel/trace/ring_buffer.c')
0 files changed, 0 insertions, 0 deletions