From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 17 Feb 2009 16:20:11 +0000 (+0100)
Subject: Merge branch 'x86/apic' into perfcounters/core
X-Git-Tag: v2.6.31-rc1~383^2~504
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b6de0092244c98b5ba1abda34c92470a20e0d0c;p=pandora-kernel.git

Merge branch 'x86/apic' into perfcounters/core

Conflicts:
	arch/x86/kernel/cpu/perfctr-watchdog.c
---

0b6de0092244c98b5ba1abda34c92470a20e0d0c
Reading git-diff-tree failed