summaryrefslogtreecommitdiff
path: root/include/linux/patchkey.h
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-05-01 23:15:49 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-02 05:17:43 +0400
commit32828546b32a96d550b85eab25609bc4ba3942ab (patch)
tree96d48910315bca328d34985337a99a8b41e8be6e /include/linux/patchkey.h
parentd2610202290b4924b71747314a0f88f28807702e (diff)
downloadlinux-32828546b32a96d550b85eab25609bc4ba3942ab.tar.xz
[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>
Diffstat (limited to 'include/linux/patchkey.h')
0 files changed, 0 insertions, 0 deletions