Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 23 Jun 2014 10:11:46 +0000 (12:11 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 Jun 2014 10:11:46 +0000 (12:11 +0200)

Trivial merge