Merge branch 'for-linus' into for-next
authorTakashi Iwai <[email protected]>
Wed, 6 Jan 2016 09:20:41 +0000 (10:20 +0100)
committerTakashi Iwai <[email protected]>
Wed, 6 Jan 2016 09:20:41 +0000 (10:20 +0100)

Trivial merge