Merge branch 'sh/cpufreq' into sh-latest
Paul Mundt [Wed, 28 Mar 2012 04:54:49 +0000 (13:54 +0900)]

Trivial merge