Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Thu, 26 Jun 2014 13:49:20 +0000 (15:49 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 26 Jun 2014 13:49:20 +0000 (15:49 +0200)

Trivial merge