diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-18 16:55:43 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-18 16:55:43 -0700 |
commit | dc8ed71eeb8adce08d3070f4130e12ee540baa59 (patch) | |
tree | 0c1fc7d6de37879a8342b346b32338d747cfb155 /init/main.c | |
parent | 7f9cfb31030737a7fc9a1cbca3fd01bec184c849 (diff) | |
parent | e412cd257e0d51e0ecbb89f50953835b5a0681b2 (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, mce: Don't initialize MCEs on unknown CPUs
x86, mce: don't log boot MCEs on Pentium M (model == 13) CPUs
x86: Annotate section mismatch warnings in kernel/apic/x2apic_uv_x.c
x86, mce: therm_throt: Don't log redundant normality
x86: Fix UV BAU destination subnode id
Diffstat (limited to 'init/main.c')
0 files changed, 0 insertions, 0 deletions