Merge branch 'for-4.7/soc' into for-4.7/genpd
authorThierry Reding <treding@nvidia.com>
Tue, 19 Apr 2016 14:53:24 +0000 (16:53 +0200)
committerThierry Reding <treding@nvidia.com>
Tue, 19 Apr 2016 14:53:24 +0000 (16:53 +0200)

Trivial merge