Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Sat, 25 Sep 2010 15:46:41 +0000 (17:46 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sat, 25 Sep 2010 15:46:41 +0000 (17:46 +0200)

Trivial merge