From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 18 Jul 2008 20:00:54 +0000 (+0200)
Subject: Merge branch 'linus' into cpus4096
X-Git-Tag: v2.6.27-rc1~848^2~18
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb2c018b09b681d43f5e08124b83e362647ea82b;p=pandora-kernel.git

Merge branch 'linus' into cpus4096

Conflicts:

	drivers/acpi/processor_throttling.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

bb2c018b09b681d43f5e08124b83e362647ea82b
Reading git-diff-tree failed