From: Linus Torvalds Date: Wed, 4 Feb 2009 17:39:12 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 X-Git-Tag: firefly_0821_release~15658 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9dfea1b46d9f147478ccdfa4a4ef472fdc98d6dd;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git./linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: pcm_oss: AFMT_S24_LE is set twice in return value ALSA: ASoC: email - update email addresses. OMAP: ASoC: Fix spinlock misuse in omap-pcm.c ALSA: hda - No widget selection for volume knob widgets in proc output ALSA: hda - Add support of iMac 24 Aluminium ALSA: alsa: time reaches -1, tested 0 ALSA: hda - Add quirk for another HP dv5 model --- 9dfea1b46d9f147478ccdfa4a4ef472fdc98d6dd