Merge branch 'fix/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 23 Apr 2010 15:10:48 +0000 (17:10 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 23 Apr 2010 15:10:48 +0000 (17:10 +0200)

Trivial merge