Merge branch 'fix/hda' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 28 May 2009 10:02:13 +0000 (12:02 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 28 May 2009 10:02:13 +0000 (12:02 +0200)
commit817682c11bb836cfe688b5601aa66f2b58a4848e
tree4b6f9ab78f960fe17a5a8bfb3e8a4f8598bb28b7
parentf5219b619504875a14b63659eecd86098208620c
parent1812e67c7410c8d0d57f14a3dc81a99bd5b30e3e
Merge branch 'fix/hda' into for-linus

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