From: Linus Torvalds Date: Tue, 5 May 2009 15:22:55 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 X-Git-Tag: v2.6.30-rc5~44 X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=71019c350aca8fe650246988e64bfd2c89192180;p=safe%2Fjmp%2Flinux-2.6 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: ASoC: Remove BROKEN from mpc5200 kconfig ASoC: TWL4030: Fix gain control for earpiece amplifier ALSA: pcm core - Avoid jiffies check for devices with BATCH flag ALSA: Add missing SNDRV_PCM_INFO_BATCH flag to some drivers ALSA: indigo-express: add missing 64KHz flags ASoC: Set the MPC5200 i2s driver to BROKEN status. ASoC: Fix logic in WM8350 master clocking check --- 71019c350aca8fe650246988e64bfd2c89192180