From: Linus Torvalds Date: Wed, 12 Aug 2009 15:32:47 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b637dc0dba6a243da2c74f5d02b42ba5eeb9425e;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.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: hda - Don't override ADC definitions for ALC codecs ALSA: hda - Add missing vmaster initialization for ALC269 ASoC: Add missing DRV_NAME definitions for fsl/* drivers --- b637dc0dba6a243da2c74f5d02b42ba5eeb9425e