Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 23 Jun 2010 14:02:49 +0000 (16:02 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 23 Jun 2010 14:02:49 +0000 (16:02 +0200)

Trivial merge