Merge branch 'fix/hda' into for-linus
Takashi Iwai [Thu, 2 Jul 2009 15:48:33 +0000 (17:48 +0200)]
* fix/hda:
  ALSA: hda - Add quirk for HP 6930p
  ALSA: hda - Add missing static to patch_ca0110()

1  2 
sound/pci/hda/patch_analog.c

Simple merge