diff options
| author | Daniel Vetter <[email protected]> | 2019-06-19 10:04:55 +0000 |
|---|---|---|
| committer | Daniel Vetter <[email protected]> | 2019-06-19 10:07:29 +0000 |
| commit | 52d2d44eee8091e740d0d275df1311fb8373c9a9 (patch) | |
| tree | 4aff282e84b3469f18cf9717490b892f6f39198f /drivers/clocksource/timer-stm32.c | |
| parent | Merge tag 'drm-misc-next-2019-06-14' of git://anongit.freedesktop.org/drm/drm... (diff) | |
| parent | Linux 5.2-rc5 (diff) | |
| download | kernel-52d2d44eee8091e740d0d275df1311fb8373c9a9.tar.gz kernel-52d2d44eee8091e740d0d275df1311fb8373c9a9.zip | |
Merge v5.2-rc5 into drm-next
Maarten needs -rc4 backmerged so he can pull in the fbcon notifier
removal topic branch into drm-misc-next.
Signed-off-by: Daniel Vetter <[email protected]>
Diffstat (limited to 'drivers/clocksource/timer-stm32.c')
| -rw-r--r-- | drivers/clocksource/timer-stm32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c index 2717f88c7904..c9a753f96ba1 100644 --- a/drivers/clocksource/timer-stm32.c +++ b/drivers/clocksource/timer-stm32.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) Maxime Coquelin 2015 * Author: Maxime Coquelin <[email protected]> - * License terms: GNU General Public License (GPL), version 2 * * Inspired by time-efm32.c from Uwe Kleine-Koenig */ |