diff options
| author | Joerg Roedel <jroedel@suse.de> | 2019-06-03 13:00:40 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2019-06-03 13:00:40 +0200 |
| commit | 2de03c11171544bd23e18539f65b3b561d57ff76 (patch) | |
| tree | e207052e8cbb53f587c260617c16f97fa9f7d05d /drivers/clocksource/timer-u300.c | |
| parent | e314a7c92b3217e893cbe03b944c7afc9cbd3e4c (diff) | |
| parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) | |
| download | blackbird-op-linux-2de03c11171544bd23e18539f65b3b561d57ff76.tar.gz blackbird-op-linux-2de03c11171544bd23e18539f65b3b561d57ff76.zip | |
Merge tag 'v5.2-rc3' into x86/vt-d
Linux 5.2-rc3
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> */ |
