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)
Conflicts:
sound/drivers/pcsp/pcsp_lib.c


Trivial merge