Merge branch 'for-3.7/common-clk' into for-3.7/cleanup2
authorStephen Warren <swarren@nvidia.com>
Fri, 14 Sep 2012 17:34:53 +0000 (11:34 -0600)
committerStephen Warren <swarren@nvidia.com>
Fri, 14 Sep 2012 17:34:53 +0000 (11:34 -0600)

Trivial merge