Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 14 Jul 2010 13:15:07 +0000 (15:15 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 14 Jul 2010 13:15:07 +0000 (15:15 +0200)

Trivial merge