Skip to content
Commit 45d60e36 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/sc6000' into for-linus 

* topic/sc6000:
  ALSA: sc6000: enable joystick port
  ALSA: sc6000: fix older card initialization
  ALSA: sc6000: add support for SC-6600 and SC-7000
parents 87cb14a5 b0ec3a30
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment