tree 783e0de03e1d7aba82f75dc1e42051a42939b82e
parent 0d280884961de51afd87465f72ade9e8876d1e26
parent de2cf591bc876f7a63809d8955855ab074588c30
author Linus Torvalds <torvalds@linux-foundation.org> 1233281602 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1233281602 -0800

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: OMAP: Initialize XCCR and RCCR registers in McBSP DAI driver
  ASoC: Fix null string usage with WM8753 DAIs
  ALSA: hda - add another MacBook Pro 4, 1 subsystem ID
  ALSA: hda - Fix compile warning with CONFIG_SND_JACK=n
  ALSA: hda - Add quirk for HP DV6700 laptop
  ALSA: hda - Fix PCM reference NID for STAC/IDT analog outputs