diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-07 03:02:37 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-07 03:02:37 +0400 |
| commit | edf7c8148ec40c0fd27c0ef3f688defcc65e3913 (patch) | |
| tree | dde7448208538c616ad3ba25b41a816fccc015af /drivers/net/ethernet/8390/ne-h8300.c | |
| parent | 82406da4a6998a0c98db0c5afb1695f97889bf79 (diff) | |
| parent | a228b5892b0527b8574c06edc72cacaf8c25418d (diff) | |
| download | linux-edf7c8148ec40c0fd27c0ef3f688defcc65e3913.tar.xz | |
Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* '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
Diffstat (limited to 'drivers/net/ethernet/8390/ne-h8300.c')
0 files changed, 0 insertions, 0 deletions