Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 2 Feb 2011 16:51:58 +0000 (17:51 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 2 Feb 2011 16:51:58 +0000 (17:51 +0100)

Trivial merge