From: Linus Torvalds Date: Sun, 8 Mar 2009 17:03:31 +0000 (-0700) Subject: Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d3dea1e2d5b08964a8d47a29b4f6807a60d40f4c;p=linux-2.6-omap-h63xx.git Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - Fix headphone-detect regression with multiple HP jacks ALSA: hda - Fix typos in slave controls in patch_sigmatel.c --- d3dea1e2d5b08964a8d47a29b4f6807a60d40f4c