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

Merge branch 'linus' into oprofile

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

c493756e2a8a78bcaae30668317890dcfe86e7c3
Reading git-diff-tree failed