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-footbridge/include/mach/memory.h | |
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-footbridge/include/mach/memory.h')
-rw-r--r-- | arch/arm/mach-footbridge/include/mach/memory.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-footbridge/include/mach/memory.h b/arch/arm/mach-footbridge/include/mach/memory.h index 6f2ecccdf323..46fd4a8872b9 100644 --- a/arch/arm/mach-footbridge/include/mach/memory.h +++ b/arch/arm/mach-footbridge/include/mach/memory.h @@ -1,12 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * arch/arm/mach-footbridge/include/mach/memory.h * * Copyright (C) 1996-1999 Russell King. * - * 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. - * * Changelog: * 20-Oct-1996 RMK Created * 31-Dec-1997 RMK Fixed definitions to reduce warnings. |