tree efa9d084f98749a35555afd9898b92d51d3755d2
parent a1cf64944f6f2ffe5ef30a0ee4d529db771f7db2
parent 975f6b0c1b0efb66db455d2e76bacba06cc65541
author Linus Torvalds <torvalds@linux-foundation.org> 1224518996 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1224518996 -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:
  ALSA: ASoC: OMAP: Fix DSP DAI format in McBSP DAI driver
  go7007 - Add missing dependency on sound subsystem
  ALSA: ps3: Add support for SPDIF/HDMI passthru
  ps3: Add passthru support for non-audio streams
  ps3: Add ps3av_audio_mute_analog()
  ALSA: misc typo fixes
  sound: add missing pcm kernel-doc