From: Linus Torvalds Date: Thu, 22 Dec 2011 02:29:05 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound X-Git-Tag: firefly_0821_release~3680^2~3902 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d5ed5e48f4a6333cde05c5235b88a8a94e72afe8;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git./linux/kernel/git/tiwai/sound * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: atmel/ac97c: using software reset instead hardware reset if not available --- d5ed5e48f4a6333cde05c5235b88a8a94e72afe8