From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 13 Oct 2008 09:05:51 +0000 (+0200)
Subject: Merge branch 'linus' into oprofile-v2
X-Git-Tag: v2.6.28-rc1~611^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=accba5f3965d6a9d1bf7c1e1a7995d17e9d521b6;p=pandora-kernel.git

Merge branch 'linus' into oprofile-v2

Conflicts:
	arch/x86/kernel/apic_32.c
	arch/x86/oprofile/nmi_int.c
	include/linux/pci_ids.h
---

accba5f3965d6a9d1bf7c1e1a7995d17e9d521b6
Reading git-diff-tree failed