Merge branch 'for-4.2/ramcode' into for-4.2/emc
authorThierry Reding <treding@nvidia.com>
Tue, 5 May 2015 09:10:08 +0000 (11:10 +0200)
committerThierry Reding <treding@nvidia.com>
Tue, 5 May 2015 09:10:08 +0000 (11:10 +0200)

Trivial merge