From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 7 Mar 2007 01:32:45 +0000 (-0800)
Subject: Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
X-Git-Tag: v2.6.21-rc3~20
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cba5a641ca7887dc371486681dac887869d1c7b7;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
  [ALSA] version 1.0.14rc3
  [ALSA] cmipci - Allow to disable integrated FM port
  [ALSA] hda-codec - Fix logic error in headphone mute for Conexant codecs
  [ALSA] hda-codec - Add missing Mic Boost for AD1986A codec
  [ALSA] ac97 - Add Thinkpad X31 and R40 to AD1981x blacklist
  [ALSA] Add missing sysfs device assignment for ALSA PCI drivers
  [ALSA] hda-codec - Define pin configs for MacBooks
  [ALSA] hda-codec - Add missing Mic Boost controls for ALC262
  [ALSA] soc - WM9712 PCM volume
  [ALSA] soc - Fix WM9712 register cache entry
  [ALSA] hda-codec - Add method for configuring Mac Pro without PCI SSID
  [ALSA] hda-codec - Add LFE support on Dell M90
---

cba5a641ca7887dc371486681dac887869d1c7b7