tree 5d31cd034f5e3e7701e079b6b42159c89e8a1920
parent 2b5baad1656d2e193308333636707ace4a2fff56
parent 04fa11ea170afd147b5d1e1ec88ec359a766bf31
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1198198957 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1198198957 -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: intel_cacheinfo.c: cpu cache info entry for Intel Tolapai
  x86: fix die() to not be preemptible