Merge branch 'topic/cmi8330' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 10 Sep 2009 13:32:45 +0000 (15:32 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 10 Sep 2009 13:32:45 +0000 (15:32 +0200)
commit9d2743f84d08ce9c6ea8369c571b04385b42fb01
treedfbcf64dda2a1c4321bf4b4cee120d5ed0612ebd
parentd0064a1b22d0f60058902a870e6bf9aab0d8202c
parent72b43cf1402169e8bc088838a6db91d613c35627
Merge branch 'topic/cmi8330' into for-linus

* topic/cmi8330:
  ALSA: cmi8330: Allow MPU-401-less operation
  ALSA: cmi8330: find OPL3 port automatically
  cmi8330: Add basic CMI8329 support
  ALSA: cmi8330: revert comments about AD1848 back