diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-13 08:19:11 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-13 08:19:11 -0800 |
commit | b51ebdc40cf3a9eb4d3ace48dbd254bb0184481d (patch) | |
tree | 3ed377006b9659e9045eb2d0df995342a6ccca2f /include/linux/nbd.h | |
parent | fb5ae64fdde29236e1a15e0366946df7060f41f2 (diff) | |
parent | 99cbb86180bccd77f331f6e8eb7ce26aeea2cb72 (diff) | |
download | op-kernel-dev-b51ebdc40cf3a9eb4d3ace48dbd254bb0184481d.zip op-kernel-dev-b51ebdc40cf3a9eb4d3ace48dbd254bb0184481d.tar.gz |
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:
ASoC: Only register AC97 bus if it's not done already
ALSA: hda - Add snd_hda_multi_out_dig_cleanup()
ALSA: hda - Add missing terminator in slave dig-out array
ALSA: hda - Change HP dv7 (103c:30f4) quirk from hp-m4 to hp-dv5 model
ALSA: hda - Register (new) devices at reconfig
ALSA: mtpav - Fix initial value for input hwport
ALSA: hda - add id for Intel IbexPeak integrated HDMI codec
ALSA: hda - compute checksum in HDMI audio infoframe
ALSA: hda - enable HDMI audio pin out at module loading time
ALSA: hda - allow multi-channel HDMI audio playback when ELD is not present
ASoC: Update SDP3430 machine driver for snd_soc_card
ALSA: hda - Add quirk for Asus z37e (1043:8284)
sound: Remove OSSlib stuff from linux/soundcard.h
ASoC: WM8990: Fix kcontrol's private value use in put callback
ASoC: TLV320AIC3X: Fix kcontrol's private value use in put callback
Diffstat (limited to 'include/linux/nbd.h')
0 files changed, 0 insertions, 0 deletions