diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-26 22:03:47 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-26 22:03:47 +0100 |
commit | eed9688f8513189295887e5a27ec7f576754b60e (patch) | |
tree | c205a6fa6b8ee8a5a99179a0d42e40e4a713c450 /drivers/net/ethernet/smsc/smsc911x.h | |
parent | Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
parent | x86/mce: Restore MCE injector's module name (diff) | |
download | linux-eed9688f8513189295887e5a27ec7f576754b60e.tar.xz linux-eed9688f8513189295887e5a27ec7f576754b60e.zip |
Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 RAS updates from Borislav Petkov:
"This time around we have a subsystem reorganization to offer, with the
new directory being
arch/x86/kernel/cpu/mce/
and all compilation units' names streamlined under it"
* 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mce: Restore MCE injector's module name
x86/mce: Unify pr_* prefix
x86/mce: Streamline MCE subsystem's naming
Diffstat (limited to 'drivers/net/ethernet/smsc/smsc911x.h')
0 files changed, 0 insertions, 0 deletions