Merge branch 'topic/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 20 Apr 2011 12:24:10 +0000 (14:24 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 20 Apr 2011 12:24:10 +0000 (14:24 +0200)

Trivial merge