Merge branch 'topic/sc6000' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 10 Jun 2009 05:26:45 +0000 (07:26 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 10 Jun 2009 05:26:45 +0000 (07:26 +0200)
commit45d60e3648eaba1f5f6976df901fb7c45660fb49
treefb468f9c69a650989590dd6b5c6563fc796403e9
parent87cb14a5f46207f5c445dd755096f8568d136a2a
parentb0ec3a30bc01c15cc6277b223fae136f7b71e90c
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
Documentation/sound/alsa/ALSA-Configuration.txt
sound/isa/Kconfig