diff options
| author | Greg Kroah-Hartman | 2019-06-23 09:21:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-06-23 09:21:15 +0200 |
| commit | 58ee01007c9e00531c1280b2d99b49d29a5e9844 (patch) | |
| tree | d1feb7102591a811b4458e2e209d476580ae3687 /drivers/pwm/pwm-pxa.c | |
| parent | usb: clean up some of the computations in adu_read (diff) | |
| parent | Linux 5.2-rc6 (diff) | |
| download | kernel-qcow2-linux-58ee01007c9e00531c1280b2d99b49d29a5e9844.tar.gz kernel-qcow2-linux-58ee01007c9e00531c1280b2d99b49d29a5e9844.tar.xz kernel-qcow2-linux-58ee01007c9e00531c1280b2d99b49d29a5e9844.zip | |
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/pwm/pwm-pxa.c')
| -rw-r--r-- | drivers/pwm/pwm-pxa.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c index 4143a46684d2..a2a0912c2dcd 100644 --- a/drivers/pwm/pwm-pxa.c +++ b/drivers/pwm/pwm-pxa.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * drivers/pwm/pwm-pxa.c * * simple driver for PWM (Pulse Width Modulator) controller * - * 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. - * * 2008-02-13 initial version * eric miao <eric.miao@marvell.com> */ |