Merge branch 'topic/misc' into topic/pcsp-fix
authorTakashi Iwai <tiwai@suse.de>
Wed, 26 Nov 2008 13:12:42 +0000 (14:12 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 26 Nov 2008 13:12:42 +0000 (14:12 +0100)
commite7dd8c1bdacf658b0ade51facb2f7eaf40eb0ac4
tree0db15820fdd391a1570e1257167e8f02532c83f5
parented313489badef16d700f5a3be50e8fd8f8294bc8
parentbc4a68fed4b4c01005ef3c71ede6a8cbe91b7dc9
Merge branch 'topic/misc' into topic/pcsp-fix

Conflicts:
sound/drivers/pcsp/pcsp_lib.c
include/sound/core.h
sound/drivers/pcsp/pcsp_lib.c