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

Trivial merge