Merge branch 'fix/intel8x0' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Sun, 19 Apr 2009 09:39:57 +0000 (11:39 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sun, 19 Apr 2009 09:39:57 +0000 (11:39 +0200)
commit81584a079fc7a18b53fc7db4232419a8faadd414
tree6b3c8160d4744e46eb2cc9378bf53d5c42227d27
parent7c4112a285b00e137db04844b8b9b478e5d4363e
parentc82834251ceb81b7575927c767500bd8c4a7f928
Merge branch 'fix/intel8x0' into for-linus

* fix/intel8x0:
  ALSA: Intel8x0: Add hp_only quirk for SSID 0x1028016a (Dell Inspiron 8600)
  ALSA: Intel8x0: Remove conflicting quirk for SSID 0x103c0934