Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 12 Feb 2014 09:34:27 +0000 (10:34 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 12 Feb 2014 09:34:27 +0000 (10:34 +0100)

Trivial merge