Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 21 Feb 2011 08:35:00 +0000 (09:35 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 21 Feb 2011 08:35:00 +0000 (09:35 +0100)

Trivial merge