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

Merge branch 'linus' into x86/apic

Conflicts:
	arch/x86/mach-default/setup.c

Semantic conflict resolution:
	arch/x86/kernel/setup.c

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

fc6fc7f1b1095b92d4834e69b385b91e412a7ce5
Reading git-diff-tree failed