Merge branch 'fix/hda' into for-linus
commit4413c8d2be530d7310feaceaae28350b316b2068
authorTakashi Iwai <tiwai@suse.de>
Thu, 2 Jul 2009 15:48:33 +0000 (2 17:48 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 2 Jul 2009 15:48:33 +0000 (2 17:48 +0200)
tree9fa645f9e32162d782fa78e16b59eaa4733055f6
parentcfbc78003e2b12e60a1d594ce192c30aea44eb2a
parentff84847171508a3c76eb7e483204d1be7738729b
Merge branch 'fix/hda' into for-linus

* fix/hda:
  ALSA: hda - Add quirk for HP 6930p
  ALSA: hda - Add missing static to patch_ca0110()
sound/pci/hda/patch_analog.c