Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 16 Mar 2015 13:48:05 +0000 (14:48 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 16 Mar 2015 13:48:05 +0000 (14:48 +0100)

Trivial merge