Merge branch 'for-4.11/fixes' into for-next
authorThierry Reding <thierry.reding@gmail.com>
Thu, 13 Apr 2017 15:41:49 +0000 (17:41 +0200)
committerThierry Reding <thierry.reding@gmail.com>
Thu, 13 Apr 2017 15:41:49 +0000 (17:41 +0200)

Trivial merge