From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 13 Feb 2009 08:34:07 +0000 (+0100)
Subject: Merge branch 'linus' into perfcounters/core
X-Git-Tag: v2.6.31-rc1~383^2~509
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9c4ffb11f0b19005b5b9dc8481687a3637e5887;p=pandora-kernel.git

Merge branch 'linus' into perfcounters/core

Conflicts:
	arch/x86/kernel/acpi/boot.c
---

e9c4ffb11f0b19005b5b9dc8481687a3637e5887
Reading git-diff-tree failed