From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 13 Jul 2008 20:52:27 +0000 (+0200)
Subject: Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
X-Git-Tag: v2.6.29-rc1~587^2~4^21~6
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbbcfb2211761fa69e831a78119c9288fb87eb9d;p=pandora-kernel.git

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

Conflicts:

	arch/x86/mm/ioremap.c

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

dbbcfb2211761fa69e831a78119c9288fb87eb9d
Reading git-diff-tree failed