From: Takashi Iwai Date: Wed, 10 Jun 2009 05:26:45 +0000 (+0200) Subject: Merge branch 'topic/sc6000' into for-linus X-Git-Tag: v2.6.31-rc1~363^2~10 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=45d60e3648eaba1f5f6976df901fb7c45660fb49;p=linux.git 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 --- 45d60e3648eaba1f5f6976df901fb7c45660fb49