diff options
author | Greg Kroah-Hartman | 2017-12-11 08:41:08 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2017-12-11 08:41:08 +0100 |
commit | 42e64571d516ef761d9f330c80493637cbf3bdda (patch) | |
tree | 5f3df1c06c2d571efa5fd72d0c8022a80140eec2 /arch/s390/kvm/interrupt.c | |
parent | serial: imx: Support common rs485 binding for RTS polarity (diff) | |
parent | Linux 4.15-rc3 (diff) | |
download | kernel-qcow2-linux-42e64571d516ef761d9f330c80493637cbf3bdda.tar.gz kernel-qcow2-linux-42e64571d516ef761d9f330c80493637cbf3bdda.tar.xz kernel-qcow2-linux-42e64571d516ef761d9f330c80493637cbf3bdda.zip |
Merge 4.15-rc3 into tty-next
We want the serial/tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/s390/kvm/interrupt.c')
-rw-r--r-- | arch/s390/kvm/interrupt.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index fa557372d600..024ad8bcc516 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * handling kvm guest interrupts * * Copyright IBM Corp. 2008, 2015 * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License (version 2 only) - * as published by the Free Software Foundation. - * * Author(s): Carsten Otte <cotte@de.ibm.com> */ |