tree d4c9eccad139dc295db915302270d05dff62072c
parent a3383e8372c0c11238f9bb9777929bfc3a2d320a
parent 5aad6c5f7733b94e666e3bf8b57beb7bbee15886
author Linus Torvalds <torvalds@linux-foundation.org> 1292606850 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1292606850 -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 - Fix conflict of Mic Boot controls
  ALSA: HDA: Enable subwoofer on Asus G73Jw
  ALSA: HDA: Fix auto-mute on Lenovo Edge 14
  ASoC: Fix bias power down of non-DAPM codec
  ASoC: WM8580: Fix R8 initial value
  ASoC: fix deemphasis control in wm8904/55/60 codecs