Merge branch 'for-4.5/soc' into for-4.5/dt
authorThierry Reding <treding@nvidia.com>
Tue, 24 Nov 2015 15:51:59 +0000 (16:51 +0100)
committerThierry Reding <treding@nvidia.com>
Tue, 24 Nov 2015 15:51:59 +0000 (16:51 +0100)

Trivial merge