Merge branch 'for-4.10/firmware' into for-4.10/reset
authorThierry Reding <treding@nvidia.com>
Fri, 18 Nov 2016 13:34:46 +0000 (14:34 +0100)
committerThierry Reding <treding@nvidia.com>
Fri, 18 Nov 2016 13:34:46 +0000 (14:34 +0100)

Trivial merge