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)
commitfe506d6bc5d7b9c0c1d630eecb32241c1d362462
treea74c60ddad5dcd1df84caeb454758e30f1781e3d
parentc9294e4b3793e2bd397691ae015283eecca29562
parent730d45f9130f81fd49009301e9dfbd19fe2b3e1f
Merge branch 'topic/emu10k1' into for-linus
sound/pci/emu10k1/emu10k1_main.c