tree 7dc3c7f4b6bca030a8308537fbc7367f36c32003
parent f589b86d4b6e067b720a253bdb40896857804037
parent 17d57a9206b4de6ad082ac9f2d2346985abbd2aa
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1196700315 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1196700315 -0800

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: fix x86-32 early fixmap initialization.
  x86: disable hpet legacy replacement for kdump
  x86: disable hpet on shutdown