diff options
author | Mark Brown <broonie@kernel.org> | 2019-06-26 12:39:34 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-06-26 12:39:34 +0100 |
commit | 53c8b29abe42e5601cfa0ea5962532f0cfdec8a0 (patch) | |
tree | cad53f42ce7a03c39a984bcdbcc42cd47f1af6f9 /drivers/clocksource/timer-u300.c | |
parent | e3303268f9cfa4eb7c2217df471417d4327109fd (diff) | |
parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
download | talos-op-linux-53c8b29abe42e5601cfa0ea5962532f0cfdec8a0.tar.gz talos-op-linux-53c8b29abe42e5601cfa0ea5962532f0cfdec8a0.zip |
Merge tag 'v5.2-rc6' into asoc-5.3
Linux 5.2-rc6
Diffstat (limited to 'drivers/clocksource/timer-u300.c')
-rw-r--r-- | drivers/clocksource/timer-u300.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/timer-u300.c b/drivers/clocksource/timer-u300.c index be34b116d4d2..32adc3057dda 100644 --- a/drivers/clocksource/timer-u300.c +++ b/drivers/clocksource/timer-u300.c @@ -1,6 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2007-2009 ST-Ericsson AB - * License terms: GNU General Public License (GPL) version 2 * Timer COH 901 328, runs the OS timer interrupt. * Author: Linus Walleij <linus.walleij@stericsson.com> */ |