From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 11 Feb 2009 08:22:04 +0000 (+0100)
Subject: Merge commit 'v2.6.29-rc4' into perfcounters/core
X-Git-Tag: v2.6.31-rc1~383^2~513
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c;p=pandora-kernel.git

Merge commit 'v2.6.29-rc4' into perfcounters/core

Conflicts:
	arch/x86/kernel/setup_percpu.c
	arch/x86/mm/fault.c
	drivers/acpi/processor_idle.c
	kernel/irq/handle.c
---

95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c
Reading git-diff-tree failed