tree 78b315b3389b552f38ed14099c1a5a26b944964c
parent 9b0c474f0a2366d6a9c4e7a0f348875017a841a5
parent 50c668d678fd01284799a6e4f1b91829d83cb9ed
author Linus Torvalds <torvalds@linux-foundation.org> 1231804438 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1231804438 -0800

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  Revert "cpumask: use work_on_cpu in acpi-cpufreq.c for drv_read and drv_write"
  x86: fix apic.c build error on latest git
  x86: fix mpparse.c build error on latest git
  x86: avoid theoretical vmalloc fault loop
  x86, mtrr: fix types used in userspace exported header