From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 3 Dec 2007 16:45:15 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
X-Git-Tag: v2.6.24-rc4~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1a2edea9aff48c31302e07100ddbaba358596cd7;p=linux-2.6-omap-h63xx.git

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
---

1a2edea9aff48c31302e07100ddbaba358596cd7