Merge branch 'topic/sscape-fix' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:36:21 +0000 (00:36 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:36:21 +0000 (00:36 +0100)
commitd0807323345f1cd8ab578b09aab04d10862e9414
tree0a1cca9055d4534590779f014199116c7c802d57
parentd7b6df5d1af11544401ca051aaf68b6e7f110c0e
parent453e37b37521b613f0927fcf53ccd93ad3a8b3ae
Merge branch 'topic/sscape-fix' into for-linus
sound/isa/Kconfig
sound/isa/sscape.c
sound/isa/wss/wss_lib.c