Merge branch 'for_3.4/cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/git/khilm...
authorDave Jones <davej@redhat.com>
Wed, 7 Mar 2012 20:27:02 +0000 (15:27 -0500)
committerDave Jones <davej@redhat.com>
Wed, 7 Mar 2012 20:27:02 +0000 (15:27 -0500)

Trivial merge