projects
/
profile
/
common
/
kernel-common.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
82406da
a228b58
)
Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 6 Jan 2012 23:02:37 +0000
(15:02 -0800)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 6 Jan 2012 23:02:37 +0000
(15:02 -0800)
* 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: add IRQ context simulation in module mce-inject
x86, mce, therm_throt: Don't report power limit and package level thermal throttle events in mcelog
x86, MCE: Drain mcelog buffer
x86, mce: Add wrappers for registering on the decode chain
1
2
arch/x86/kernel/cpu/mcheck/mce.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/x86/kernel/cpu/mcheck/therm_throt.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/edac/sb_edac.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/x86/kernel/cpu/mcheck/mce.c
Simple merge
diff --cc
arch/x86/kernel/cpu/mcheck/therm_throt.c
Simple merge
diff --cc
drivers/edac/sb_edac.c
Simple merge