Merge branch 'fix/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Sun, 20 Jun 2010 08:38:19 +0000 (10:38 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sun, 20 Jun 2010 08:38:19 +0000 (10:38 +0200)

Trivial merge