tree fb468f9c69a650989590dd6b5c6563fc796403e9
parent 87cb14a5f46207f5c445dd755096f8568d136a2a
parent b0ec3a30bc01c15cc6277b223fae136f7b71e90c
author Takashi Iwai <tiwai@suse.de> 1244611605 +0200
committer Takashi Iwai <tiwai@suse.de> 1244611605 +0200

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