tree 9fa645f9e32162d782fa78e16b59eaa4733055f6
parent cfbc78003e2b12e60a1d594ce192c30aea44eb2a
parent ff84847171508a3c76eb7e483204d1be7738729b
author Takashi Iwai <tiwai@suse.de> 1246549713 +0200
committer Takashi Iwai <tiwai@suse.de> 1246549713 +0200

Merge branch 'fix/hda' into for-linus

* fix/hda:
  ALSA: hda - Add quirk for HP 6930p
  ALSA: hda - Add missing static to patch_ca0110()