From: Takashi Iwai <tiwai@suse.de>
Date: Sun, 19 Apr 2009 09:39:46 +0000 (+0200)
Subject: Merge branch 'fix/hda' into for-linus
X-Git-Tag: v4.14-rc1~23714^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7c4112a285b00e137db04844b8b9b478e5d4363e;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'fix/hda' into for-linus

* fix/hda:
  ALSA: hda - Set function_id only on FG nodes
  ALSA: hda - Add upper-limit of mixer amp for AD1884A-laptop model, too
  ALSA: hda - Fix headphone-detection on some machines with STAC/IDT codecs
  ALSA: hda_intel.c - Consolidate bitfields
---

7c4112a285b00e137db04844b8b9b478e5d4363e