Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 25 May 2011 07:37:42 +0000 (09:37 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 25 May 2011 07:37:42 +0000 (09:37 +0200)

Trivial merge