Merge branches 'topic/fix/misc' and 'topic/fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 30 Oct 2008 13:26:24 +0000 (14:26 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 30 Oct 2008 13:26:24 +0000 (14:26 +0100)

Trivial merge