From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 13 Feb 2009 08:44:22 +0000 (+0100)
Subject: Merge branch 'linus' into x86/apic
X-Git-Tag: v2.6.30-rc1~211^2~26^2~2^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8a6b2b9cee298a9663cbe38ce1eb5240987cb62;p=pandora-kernel.git

Merge branch 'linus' into x86/apic

Conflicts:
	arch/x86/kernel/acpi/boot.c
	arch/x86/mm/fault.c
---

f8a6b2b9cee298a9663cbe38ce1eb5240987cb62
Reading git-diff-tree failed