Merge branch 'topic/sc6000' into for-linus
Takashi Iwai [Wed, 10 Jun 2009 05:26:45 +0000 (07:26 +0200)]
* topic/sc6000:
  ALSA: sc6000: enable joystick port
  ALSA: sc6000: fix older card initialization
  ALSA: sc6000: add support for SC-6600 and SC-7000

1  2 
Documentation/sound/alsa/ALSA-Configuration.txt
sound/isa/Kconfig

Simple merge