diff options
author | 2017-11-07 18:11:56 -0800 | |
---|---|---|
committer | 2017-11-07 18:11:56 -0800 | |
commit | 0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081 (patch) | |
tree | f0aa64e956d1d2addb2263ddcd238e9f014b36a0 /kernel/irq/affinity.c | |
parent | Input: convert autorepeat timer to use timer_setup() (diff) | |
parent | Linux 4.14-rc8 (diff) | |
download | linux-dev-0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081.tar.xz linux-dev-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 'kernel/irq/affinity.c')
-rw-r--r-- | kernel/irq/affinity.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/irq/affinity.c b/kernel/irq/affinity.c index d69bd77252a7..e12d35108225 100644 --- a/kernel/irq/affinity.c +++ b/kernel/irq/affinity.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2016 Thomas Gleixner. * Copyright (C) 2016-2017 Christoph Hellwig. |