From: Linus Torvalds Date: Mon, 23 Oct 2006 17:58:33 +0000 (-0700) Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa X-Git-Tag: v2.6.19-rc3~4 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=dee6515b6d12188f4b9bbe76613371f7840a8a53;p=~emulex%2Finfiniband.git Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa: [ALSA] hda-intel - Add check of MSI availabity [ALSA] version 1.0.13 [ALSA] Fix addition of user-defined boolean controls [ALSA] Fix AC97 power-saving mode [ALSA] Fix re-use of va_list [ALSA] hda_intel: add ATI RS690 HDMI audio support [ALSA] hda-codec - Add model entry for ASUS U5F laptop [ALSA] Fix dependency of snd-adlib driver in Kconfig [ALSA] Various fixes for suspend/resume of ALSA PCI drivers [ALSA] hda-codec - Fix assignment of PCM devices for Realtek codecs [ALSA] sound/isa/opti9xx/opti92x-ad1848.c: check kmalloc() return value [ALSA] sound/isa/ad1816a/ad1816a.c: check kmalloc() return value [ALSA] sound/isa/cmi8330.c: check kmalloc() return value [ALSA] sound/isa/gus/interwave.c: check kmalloc() return value --- dee6515b6d12188f4b9bbe76613371f7840a8a53