From: Linus Torvalds Date: Fri, 16 Sep 2011 05:13:48 +0000 (-0700) Subject: Merge branch 'for-linus' of git://github.com/tiwai/sound X-Git-Tag: v3.1-rc7~30 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=c455ea4f122d21c91fcf4c36c3f0c08535ba3ce8 Merge branch 'for-linus' of git://github.com/tiwai/sound * 'for-linus' of git://github.com/tiwai/sound: ALSA: pcm - fix race condition in wait_for_avail() ALSA: HDA: Cirrus - fix "Surround Speaker" volume control name ALSA: hda - Terminate the recursive connection search properly ASoC: Fix trivial build regression in Kirkwood I2S ASoC: Blackfin: bf5xx-ad193x: Fix codec device name ASoC: Fix reporting of partial jack updates ASoC: imx: Fix build warning of unused 'card' variable ASoC: Fix register cache sync register_writable WARN_ONs ASoC: snd_soc_codec_{readable,writable}_register change default to true ASoC: soc-dapm: Fix parameter comment for snd_soc_dapm_free MAINTAINERS: Add some missed Wolfson files ASoC: MPC5200: replace of_device with platform_device --- c455ea4f122d21c91fcf4c36c3f0c08535ba3ce8