Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup
authorStephen Warren <swarren@nvidia.com>
Mon, 28 Jan 2013 17:20:34 +0000 (10:20 -0700)
committerStephen Warren <swarren@nvidia.com>
Mon, 28 Jan 2013 17:20:34 +0000 (10:20 -0700)

Trivial merge