Merge branch 'topic/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 11 Aug 2010 06:43:09 +0000 (08:43 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 11 Aug 2010 06:43:09 +0000 (08:43 +0200)

Trivial merge