From: Andi Kleen <ak@suse.de>
Date: Mon, 1 May 2006 19:15:49 +0000 (-0700)
Subject: [PATCH] i386/x86-64: Fix ACPI disabled LAPIC handling mismerge
X-Git-Tag: v2.6.17-rc4~93
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32828546b32a96d550b85eab25609bc4ba3942ab;p=pandora-kernel.git

[PATCH] i386/x86-64: Fix ACPI disabled LAPIC handling mismerge

The patch I submitted earlier to fix disabled LAPIC handling in ACPI was
mismerged for some reason I still don't quite understand.  Parts of it was
applied to the wrong function.

This patch fixes it up.

Cc: <len.brown@intel.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

Reading git-diff-tree failed