tree 4b6f9ab78f960fe17a5a8bfb3e8a4f8598bb28b7
parent f5219b619504875a14b63659eecd86098208620c
parent 1812e67c7410c8d0d57f14a3dc81a99bd5b30e3e
author Takashi Iwai <tiwai@suse.de> 1243504933 +0200
committer Takashi Iwai <tiwai@suse.de> 1243504933 +0200

Merge branch 'fix/hda' into for-linus

* fix/hda:
  ALSA: hda - Compaq Presario CQ60 patching for Conexant