diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-30 12:55:10 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-30 12:55:10 -0800 |
commit | 8fa4d8702de3b32854344635667290776d1a754b (patch) | |
tree | d3571a3f476c199bcfc7cd493ee22472045b58ad /arch/x86 | |
parent | ed656d8deccc5669afa33387568e7ec6f14e3e94 (diff) | |
parent | cc0db22afd9b963a4a78b634d360033bdda37650 (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 - Fix Oops at reloading beep devices
ALSA: hda - Don't cache beep controls
ALSA: Fix a typo in Procfile.txt
ALSA: sound/arm: Fix build failure caused by missing struct aaci definition
ALSA: hda - use snd_hda_jack_detect() again in patch_sigmatel.c
ALSA: hda - Disable tigger at pin-sensing on AD codecs
ALSA: hda - HDMI sticky stream tag support
ALSA: Fix indentation in pcm_native.c
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions