From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 21 Dec 2007 01:02:37 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
X-Git-Tag: v2.6.24-rc6~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4bde57094b3aac7c5d80fc82530db8b03c3ce2d3;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: intel_cacheinfo.c: cpu cache info entry for Intel Tolapai
  x86: fix die() to not be preemptible
---

4bde57094b3aac7c5d80fc82530db8b03c3ce2d3