Merge branch 'topic/emu10k1' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:36:08 +0000 (00:36 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:36:08 +0000 (00:36 +0100)
1  2 
sound/pci/emu10k1/emu10k1_main.c

Simple merge