Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
commit1a2edea9aff48c31302e07100ddbaba358596cd7
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 3 Dec 2007 16:45:15 +0000 (3 08:45 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 3 Dec 2007 16:45:15 +0000 (3 08:45 -0800)
tree7dc3c7f4b6bca030a8308537fbc7367f36c32003
parentf589b86d4b6e067b720a253bdb40896857804037
parent17d57a9206b4de6ad082ac9f2d2346985abbd2aa
Merge git://git./linux/kernel/git/x86/linux-2.6-x86

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86: fix x86-32 early fixmap initialization.
  x86: disable hpet legacy replacement for kdump
  x86: disable hpet on shutdown