commit 6e1b97d899401035dd9d02b0fd93ad54641f867a
author Linus Torvalds <torvalds@woody.linux-foundation.org> Sat Oct 27 22:18:55 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Sat Oct 27 22:18:55 2007 -0700
tree f98006592293d38b25a30ab08c3ae88601ac76c1
parent 36ea96a485ce09a88819896e48468d6469c292ab
parent 69243f91257083795065762ce805120b980e256b

Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86: Dump filtering supports x86_64 sparsemem
  x86: fix compiler warnings in arch/x86/kernel/early-quirks.c
  x86: fix !SMP compiler warning in arch/x86/kernel/acpi/processor.c
  x86: Fix boot protocol KEEP_SEGMENTS check.
  x86: voyager: fix bogus conversion to per_cpu for boot_cpu_info
  x86: export smp_ops to allow modular build of KVM
  Revert "i386: export i386 smp_call_function_mask() to modules"