Merge branch 'fix/misc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 27 Apr 2011 15:00:17 +0000 (17:00 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 27 Apr 2011 15:00:17 +0000 (17:00 +0200)

Trivial merge