Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Sun, 15 Aug 2010 12:29:40 +0000 (14:29 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sun, 15 Aug 2010 12:29:40 +0000 (14:29 +0200)

Trivial merge