Merge branch 'for-3.20/soc' into for-3.20/arm64
authorThierry Reding <treding@nvidia.com>
Fri, 23 Jan 2015 15:25:12 +0000 (16:25 +0100)
committerThierry Reding <treding@nvidia.com>
Fri, 23 Jan 2015 15:25:12 +0000 (16:25 +0100)

Trivial merge