Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 13 Sep 2010 21:41:20 +0000 (23:41 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 13 Sep 2010 21:41:20 +0000 (23:41 +0200)

Trivial merge