diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-22 13:40:24 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-22 13:40:24 -0700 |
commit | 0988c37c248e824953d95a11412696c348dbca91 (patch) | |
tree | 0f11d926b2a655afed773f60bab7dac688ec5ca1 /include/asm-sparc/ide_64.h | |
parent | 6eaaaac97433575894570a990aa27310040a8177 (diff) | |
parent | d536b1f86591fb081c7a56eab04e711eb4dab951 (diff) |
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 'include/asm-sparc/ide_64.h')
0 files changed, 0 insertions, 0 deletions