tree bc68ea85f04d4319fd781d6f5e14bb03c41dd52a
parent 9c717de946ed7f5782e6dffacf2d05859073058c
parent 54a26089a2733df2765342acaaf71466d37ff5a5
author Linus Torvalds <torvalds@linux-foundation.org> 1261591280 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1261591280 -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:
  ALSA: hda - Add STAC9205 PCI_QUIRK for Dell Vostro 1700
  ASoC: Do not write to invalid registers on the wm9712.
  ALSA: hda - Set mixer name after codec patch
  ASoC: add missing parameter to mx27vis_hifi_hw_free()
  ASoC: sh: FSI:: don't check platform_get_irq's return value against zero
  ALSA: sound/core/pcm_timer.c: use lib/gcd.c
  ALSA: hda - Add MSI blacklist
  ALSA: hda - Add support for the new 27 inch IMacs
  ALSA: hda - Fix NULL dereference with enable_beep=0 option