diff options
| author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2017-12-29 17:49:13 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2017-12-29 17:49:13 +0100 |
| commit | 70a02f840c5113cd9255ce4c1b1848bb48b0bd21 (patch) | |
| tree | 1cd859500e4db4f4c44dadd908ce88c9b3f2a2b6 /drivers/oprofile | |
| parent | 5f215d252496543ba22299bccef5062d30d63cfe (diff) | |
| parent | 464e1d5f23cca236b930ef068c328a64cab78fb1 (diff) | |
| download | linux-70a02f840c5113cd9255ce4c1b1848bb48b0bd21.tar.bz2 | |
Merge tag 'v4.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Linux 4.15-rc5
Diffstat (limited to 'drivers/oprofile')
| -rw-r--r-- | drivers/oprofile/nmi_timer_int.c | 1 | ||||
| -rw-r--r-- | drivers/oprofile/oprofile_perf.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/oprofile/nmi_timer_int.c b/drivers/oprofile/nmi_timer_int.c index e65a576e4032..f343bd96609a 100644 --- a/drivers/oprofile/nmi_timer_int.c +++ b/drivers/oprofile/nmi_timer_int.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /** * @file nmi_timer_int.c * diff --git a/drivers/oprofile/oprofile_perf.c b/drivers/oprofile/oprofile_perf.c index d5b2732b1b81..4b150a754890 100644 --- a/drivers/oprofile/oprofile_perf.c +++ b/drivers/oprofile/oprofile_perf.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright 2010 ARM Ltd. * Copyright 2012 Advanced Micro Devices, Inc., Robert Richter |