diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-07 18:11:56 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-07 18:11:56 -0800 |
| commit | 0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081 (patch) | |
| tree | f0aa64e956d1d2addb2263ddcd238e9f014b36a0 /arch/cris/arch-v32/mach-fs/hw_settings.S | |
| parent | 4e974c120039e35b90d2cb0459452bd9a6a71594 (diff) | |
| parent | 39dae59d66acd86d1de24294bd2f343fd5e7a625 (diff) | |
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/cris/arch-v32/mach-fs/hw_settings.S')
| -rw-r--r-- | arch/cris/arch-v32/mach-fs/hw_settings.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/cris/arch-v32/mach-fs/hw_settings.S b/arch/cris/arch-v32/mach-fs/hw_settings.S index 8bde93c36214..7fbadcc48c0c 100644 --- a/arch/cris/arch-v32/mach-fs/hw_settings.S +++ b/arch/cris/arch-v32/mach-fs/hw_settings.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * This table is used by some tools to extract hardware parameters. * The table should be included in the kernel and the decompressor. |