Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpufreq-2.6
authorDave Jones <davej@redhat.com>
Mon, 27 Mar 2006 19:56:39 +0000 (14:56 -0500)
committerDave Jones <davej@redhat.com>
Mon, 27 Mar 2006 19:56:39 +0000 (14:56 -0500)

Trivial merge