tree 54519330c5eead47d14c654d46e179c6a3e0542c
parent c12f667e7563c2c0e0908c997900b91b41b23592
parent 3190dad97b5105ec9b9720f6d7bea54ee830fc2d
author Linus Torvalds <torvalds@linux-foundation.org> 1307350288 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1307350288 +0900

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: usb - turn off de-emphasis in s/pdif for cm6206
  ALSA: asihpi: Use angle brackets for system includes
  ALSA: fm801: add error handling if auto-detect fails
  ALSA: hda - Check pin support EAPD in ad198x_power_eapd_write
  ALSA: hda - Fix HP and Front pins of ad1988/ad1989 in ad198x_power_eapd()
  ALSA: 6fire: Don't leak firmware in error path
  ASoC: Fix wm_hubs input PGA ZC bits
  ASoC: Fix dapm_is_shared_kcontrol so everything isn't shared