From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 25 Jul 2008 11:08:16 +0000 (+0200)
Subject: Merge branch 'linus' into x86/x2apic
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=10a010f6953b5a14ba2f0be40a4fce1bea220875;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'linus' into x86/x2apic

Conflicts:

	drivers/pci/dmar.c

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

10a010f6953b5a14ba2f0be40a4fce1bea220875