From: Linus Torvalds Date: Tue, 13 May 2008 16:49:06 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 X-Git-Tag: Ubuntu-5.2.0-15.16~35585 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5dc93cf4576125f07cfc1b29cab0c9344c5b3d2b;p=mirror_ubuntu-eoan-kernel.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: [ALSA] ASoC: Fix wrong enum count for jack_function in N810 machine driver [ALSA] ASoC: build fix for snd_soc_info_bool_ext [ALSA] ASoC: Fix TLV320AIC3X mono line output interconnect [ALSA] soc - fsl_ssi.c fix "BUG: scheduling while atomic" [ALSA] emux midi synthesizer doesn't honor SOFT_PEDAL-release event --- 5dc93cf4576125f07cfc1b29cab0c9344c5b3d2b