diff options
author | Greg Kroah-Hartman <[email protected]> | 2019-06-03 07:25:25 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <[email protected]> | 2019-06-03 07:25:25 +0200 |
commit | 119a7fdfeecefa5a4062256ac2dcd3b69eaa8414 (patch) | |
tree | 40d834b32ce97857f3f974c95b64b6b48d415e6e /drivers/misc/ibmasm/uart.c | |
parent | 086ebf92aa791b6cc8805decffca7b8898d99a4e (diff) | |
parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) |
Merge 5.2-rc3 into usb-next
we want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'drivers/misc/ibmasm/uart.c')
-rw-r--r-- | drivers/misc/ibmasm/uart.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/misc/ibmasm/uart.c b/drivers/misc/ibmasm/uart.c index 01e2b0d7e590..a5d4c8e010ee 100644 --- a/drivers/misc/ibmasm/uart.c +++ b/drivers/misc/ibmasm/uart.c @@ -1,25 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * IBM ASM Service Processor Device Driver * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * * Copyright (C) IBM Corporation, 2004 * * Author: Max Asböck <[email protected]> - * */ #include <linux/termios.h> |