Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 6 Apr 2011 06:05:48 +0000 (08:05 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 6 Apr 2011 06:05:48 +0000 (08:05 +0200)

Trivial merge