diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 03:21:15 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 03:21:15 -0400 |
| commit | 58ee01007c9e00531c1280b2d99b49d29a5e9844 (patch) | |
| tree | d1feb7102591a811b4458e2e209d476580ae3687 /drivers/clocksource/timer-pxa.c | |
| parent | 4850f26abfcac9ed28a4db5817b46dc0bfbbbae0 (diff) | |
| parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
Merge 5.2-rc6 into usb-next
We need the USB fixes in here too.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clocksource/timer-pxa.c')
| -rw-r--r-- | drivers/clocksource/timer-pxa.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/clocksource/timer-pxa.c b/drivers/clocksource/timer-pxa.c index 395837938301..913a5d354a1f 100644 --- a/drivers/clocksource/timer-pxa.c +++ b/drivers/clocksource/timer-pxa.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | /* | 2 | /* |
| 2 | * arch/arm/mach-pxa/time.c | 3 | * arch/arm/mach-pxa/time.c |
| 3 | * | 4 | * |
| @@ -6,10 +7,6 @@ | |||
| 6 | * | 7 | * |
| 7 | * Derived from Nicolas Pitre's PXA timer handler Copyright (c) 2001 | 8 | * Derived from Nicolas Pitre's PXA timer handler Copyright (c) 2001 |
| 8 | * by MontaVista Software, Inc. (Nico, your code rocks!) | 9 | * by MontaVista Software, Inc. (Nico, your code rocks!) |
| 9 | * | ||
| 10 | * This program is free software; you can redistribute it and/or modify | ||
| 11 | * it under the terms of the GNU General Public License version 2 as | ||
| 12 | * published by the Free Software Foundation. | ||
| 13 | */ | 10 | */ |
| 14 | 11 | ||
| 15 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |