Merge branch 'for-4.8/core' into for-4.8/regulator
authorThierry Reding <thierry.reding@gmail.com>
Fri, 8 Jul 2016 15:55:00 +0000 (17:55 +0200)
committerThierry Reding <thierry.reding@gmail.com>
Fri, 8 Jul 2016 15:55:00 +0000 (17:55 +0200)

Trivial merge