projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 87cb14a b0ec3a3)
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)
* 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 patch | diff1 | diff2 | blob | history
sound/isa/Kconfig patch | diff1 | diff2 | blob | history

diff --cc sound/isa/Kconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.