Merge branch 'fix/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 23 Dec 2010 09:28:26 +0000 (10:28 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 23 Dec 2010 09:28:26 +0000 (10:28 +0100)

Trivial merge