diff options
| author | Linus Torvalds <[email protected]> | 2012-01-06 23:02:37 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2012-01-06 23:02:37 +0000 |
| commit | edf7c8148ec40c0fd27c0ef3f688defcc65e3913 (patch) | |
| tree | dde7448208538c616ad3ba25b41a816fccc015af /net/unix/af_unix.c | |
| parent | Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | Merge branch 'mce-inject' of git://git.kernel.org/pub/scm/linux/kernel/git/ra... (diff) | |
| download | kernel-edf7c8148ec40c0fd27c0ef3f688defcc65e3913.tar.gz kernel-edf7c8148ec40c0fd27c0ef3f688defcc65e3913.zip | |
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 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions