summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-20 17:02:37 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-20 17:02:37 -0800
commit4bde57094b3aac7c5d80fc82530db8b03c3ce2d3 (patch)
tree5d31cd034f5e3e7701e079b6b42159c89e8a1920 /Makefile
parent2b5baad1656d2e193308333636707ace4a2fff56 (diff)
parent04fa11ea170afd147b5d1e1ec88ec359a766bf31 (diff)
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
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions