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

Trivial merge