From: Linus Torvalds Date: Mon, 19 May 2008 16:24:49 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 X-Git-Tag: v2.6.26-rc4~125 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=83e0c24a38aa91f7d932bbcab257093b82435074;p=linux-2.6-omap-h63xx.git 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: snd-pcsp: silent misleading warning snd-pcsp: depend on CONFIG_EXPERIMENTAL snd-pcsp: put back the compatibility code for the older alsa-libs snd-pcsp: adjust help texts to frighten users --- 83e0c24a38aa91f7d932bbcab257093b82435074