diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 09:21:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 09:21:15 +0200 |
| commit | 58ee01007c9e00531c1280b2d99b49d29a5e9844 (patch) | |
| tree | d1feb7102591a811b4458e2e209d476580ae3687 /drivers/pcmcia/pxa2xx_cm_x2xx.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/pcmcia/pxa2xx_cm_x2xx.c')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_cm_x2xx.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/pcmcia/pxa2xx_cm_x2xx.c b/drivers/pcmcia/pxa2xx_cm_x2xx.c index 6e7dcfd22ede..14eae238131d 100644 --- a/drivers/pcmcia/pxa2xx_cm_x2xx.c +++ b/drivers/pcmcia/pxa2xx_cm_x2xx.c @@ -1,13 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * linux/drivers/pcmcia/pxa/pxa_cm_x2xx.c * - * 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. - * * Compulab Ltd., 2003, 2007, 2008 * Mike Rapoport <mike@compulab.co.il> - * */ #include <linux/module.h> |