]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 21 Dec 2007 01:02:37 +0000 (17:02 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 21 Dec 2007 01:02:37 +0000 (17:02 -0800)
commitb2ece9c66065d62c27f7418a7ec8ba1d3c817e6b
tree5d31cd034f5e3e7701e079b6b42159c89e8a1920
parent43e06663cc760718d0906658d29a209f2a4f6bd0
parent27c267b71a039825683509328cb19e4817184a76
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