summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-23 00:40:24 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-23 00:40:24 +0400
commit0988c37c248e824953d95a11412696c348dbca91 (patch)
tree0f11d926b2a655afed773f60bab7dac688ec5ca1 /Makefile
parent6eaaaac97433575894570a990aa27310040a8177 (diff)
parentd536b1f86591fb081c7a56eab04e711eb4dab951 (diff)
downloadlinux-0988c37c248e824953d95a11412696c348dbca91.tar.xz
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: fix crash due to missing debugctlmsr on AMD K6-3 x86: add PTE_FLAGS_MASK x86: rename PTE_MASK to PTE_PFN_MASK x86: fix pte_flags() to only return flags, fix lguest (updated) x86: use setup_clear_cpu_cap with disable_apic, fix x86: move the last Dprintk instance to pr_debug()
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions