tree f6a3524d0e456b347772c36418e8e31a77e9e668
parent f83ce3e6b02d5e48b3a43b001390e2b58820389d
parent 5d7ee52f1c3dbe0e06d9bfad4912562fd1b6eb03
author Linus Torvalds <torvalds@linux-foundation.org> 1241536975 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1241536975 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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