Merge branch 'for-4.3/clk' into for-4.3/dt
authorThierry Reding <treding@nvidia.com>
Fri, 21 Aug 2015 16:44:15 +0000 (18:44 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 21 Aug 2015 16:44:15 +0000 (18:44 +0200)

Trivial merge