Merge branch 'for-linus' into HEAD
authorTakashi Iwai <tiwai@suse.de>
Tue, 25 Feb 2014 11:12:17 +0000 (12:12 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 25 Feb 2014 11:12:17 +0000 (12:12 +0100)

Trivial merge