From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 18 Jul 2008 17:31:12 +0000 (+0200)
Subject: Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
X-Git-Tag: v2.6.29-rc1~587^2~4^21~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e370b29d35fb01bfb92c2814d6f79bf6a2cb970;p=pandora-kernel.git

Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks

Conflicts:

	drivers/pci/quirks.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

3e370b29d35fb01bfb92c2814d6f79bf6a2cb970
Reading git-diff-tree failed