diff options
author | 2019-07-03 10:50:21 +0200 | |
---|---|---|
committer | 2019-07-03 10:50:21 +0200 | |
commit | 341924049558e5f7c1a148a2c461a417933d35d9 (patch) | |
tree | 1340b4f2131737ef4be63f18ee74cd73ad12cd3e /arch/arm/mach-pxa/generic.c | |
parent | hrtimer: Use a bullet for the returns bullet list (diff) | |
parent | MAINTAINERS: Fix Andy's surname and the directory entries of VDSO (diff) | |
download | linux-341924049558e5f7c1a148a2c461a417933d35d9.tar.gz linux-341924049558e5f7c1a148a2c461a417933d35d9.tar.bz2 linux-341924049558e5f7c1a148a2c461a417933d35d9.zip |
Merge branch 'timers/vdso' into timers/core
so the hyper-v clocksource update can be applied.
Diffstat (limited to 'arch/arm/mach-pxa/generic.c')
-rw-r--r-- | arch/arm/mach-pxa/generic.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index cb73a9723d0e..ab7cdffd7ea8 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * linux/arch/arm/mach-pxa/generic.c * @@ -7,10 +8,6 @@ * * Code common to all PXA machines. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * * Since this file should be linked before any other machine specific file, * the __initcall() here will be executed first. This serves as default * initialization stuff for PXA machines which can be overridden later if |