From: Dave Jones <davej@redhat.com>
Date: Tue, 12 Dec 2006 22:41:41 +0000 (-0500)
Subject: Merge ../linus
X-Git-Tag: v2.6.20-rc1~146
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4366889dda8110247be59ca41fddb82951a8c26;p=pandora-kernel.git

Merge ../linus

Conflicts:

	drivers/cpufreq/cpufreq.c
---

c4366889dda8110247be59ca41fddb82951a8c26
Reading git-diff-tree failed