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: v3.2-rc7~13 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=d5ed5e48f4a6333cde05c5235b88a8a94e72afe8 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