projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b5baad 04fa11e)
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)
* 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


Trivial merge
Motorola kernel-slsi