diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-08 03:11:56 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-08 03:11:56 +0100 |
| commit | 0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081 (patch) | |
| tree | f0aa64e956d1d2addb2263ddcd238e9f014b36a0 /arch/alpha/include/asm/mce.h | |
| parent | Input: convert autorepeat timer to use timer_setup() (diff) | |
| parent | Linux 4.14-rc8 (diff) | |
| download | linux-0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081.tar.xz linux-0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081.zip | |
Merge tag 'v4.14-rc8' into next
Merge with mainline to bring in SPDX markings to avoid annoying merge
problems when some header files get deleted.
Diffstat (limited to 'arch/alpha/include/asm/mce.h')
| -rw-r--r-- | arch/alpha/include/asm/mce.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/include/asm/mce.h b/arch/alpha/include/asm/mce.h index 660285b9aca8..200e04e98a2f 100644 --- a/arch/alpha/include/asm/mce.h +++ b/arch/alpha/include/asm/mce.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef __ALPHA_MCE_H #define __ALPHA_MCE_H |