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/xen/sys-hypervisor.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/xen/sys-hypervisor.c')
-rw-r--r-- | drivers/xen/sys-hypervisor.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/xen/sys-hypervisor.c b/drivers/xen/sys-hypervisor.c index 9d314bba7c4e..feb1d16252e7 100644 --- a/drivers/xen/sys-hypervisor.c +++ b/drivers/xen/sys-hypervisor.c @@ -1,10 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * copyright (c) 2006 IBM Corporation * Authored by: Mike D. Day <ncmike@us.ibm.com> - * - * 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. */ #include <linux/slab.h> |