tree 0db15820fdd391a1570e1257167e8f02532c83f5
parent ed313489badef16d700f5a3be50e8fd8f8294bc8
parent bc4a68fed4b4c01005ef3c71ede6a8cbe91b7dc9
author Takashi Iwai <tiwai@suse.de> 1227705162 +0100
committer Takashi Iwai <tiwai@suse.de> 1227705162 +0100

Merge branch 'topic/misc' into topic/pcsp-fix

Conflicts:
	sound/drivers/pcsp/pcsp_lib.c