Merge branch 'for-3.10/soc' into for-3.10/clk
authorStephen Warren <swarren@nvidia.com>
Thu, 4 Apr 2013 22:08:06 +0000 (16:08 -0600)
committerStephen Warren <swarren@nvidia.com>
Thu, 4 Apr 2013 22:08:06 +0000 (16:08 -0600)

Trivial merge