summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/mce.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-10-09 09:11:09 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-10-09 09:11:09 +0200
commit4fcae770f3027abefd952c5d511ac6299828865a (patch)
tree6cf64399a20f989358831a8f9b2ac2bb19628f54 /arch/x86/include/asm/mce.h
parent2847d242a1e48ca734cee742efa0f70abf545d1e (diff)
parent8a5776a5f49812d29fe4b2d0a2d71675c3facf3f (diff)
downloadtalos-op-linux-4fcae770f3027abefd952c5d511ac6299828865a.tar.gz
talos-op-linux-4fcae770f3027abefd952c5d511ac6299828865a.zip
Merge 4.14-rc4 into usb-next
This merges in the USB fixes that we need here. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/include/asm/mce.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud