]> git.openpandora.org Git - pandora-kernel.git/commitdiff
Merge ../linus
authorDave Jones <davej@redhat.com>
Tue, 12 Dec 2006 22:41:41 +0000 (17:41 -0500)
committerDave Jones <davej@redhat.com>
Tue, 12 Dec 2006 22:41:41 +0000 (17:41 -0500)
Conflicts:

drivers/cpufreq/cpufreq.c


Trivial merge