diff options
| author | Thomas Gleixner | 2019-07-03 10:50:21 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2019-07-03 10:50:21 +0200 |
| commit | 341924049558e5f7c1a148a2c461a417933d35d9 (patch) | |
| tree | 1340b4f2131737ef4be63f18ee74cd73ad12cd3e /arch/arm/mach-imx/devices/platform-flexcan.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 | kernel-qcow2-linux-341924049558e5f7c1a148a2c461a417933d35d9.tar.gz kernel-qcow2-linux-341924049558e5f7c1a148a2c461a417933d35d9.tar.xz kernel-qcow2-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-imx/devices/platform-flexcan.c')
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-flexcan.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/devices/platform-flexcan.c b/arch/arm/mach-imx/devices/platform-flexcan.c index 8a1a2fc4ce10..e4eed35c1fe2 100644 --- a/arch/arm/mach-imx/devices/platform-flexcan.c +++ b/arch/arm/mach-imx/devices/platform-flexcan.c @@ -1,9 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2010 Pengutronix, Marc Kleine-Budde <kernel@pengutronix.de> - * - * 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. */ #include "../hardware.h" #include "devices-common.h" |