Merge branch 'for-4.11/core' into for-next
authorThierry Reding <thierry.reding@gmail.com>
Fri, 10 Feb 2017 14:15:54 +0000 (15:15 +0100)
committerThierry Reding <thierry.reding@gmail.com>
Fri, 10 Feb 2017 14:15:54 +0000 (15:15 +0100)

Trivial merge