Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Thu, 8 Jul 2010 16:42:42 +0000 (18:42 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 8 Jul 2010 16:42:42 +0000 (18:42 +0200)

Trivial merge