diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 13:29:03 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 13:29:03 +0200 |
commit | 90b45399b4418a3542fe096b92840b3bf235e78e (patch) | |
tree | a75e3e37503be4fe4c7d718248bd5a844c8705e1 /drivers/uwb/drp-ie.c | |
parent | e39956c0d35efc36acbead9fc624a9ffd7d7ab82 (diff) | |
parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) |
Merge 5.2-rc6 into staging-next
We want the fixes and this resolves a merge issue as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/uwb/drp-ie.c')
-rw-r--r-- | drivers/uwb/drp-ie.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/uwb/drp-ie.c b/drivers/uwb/drp-ie.c index ed993e363472..4b545b41161c 100644 --- a/drivers/uwb/drp-ie.c +++ b/drivers/uwb/drp-ie.c @@ -1,20 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * UWB DRP IE management. * * Copyright (C) 2005-2006 Intel Corporation * Copyright (C) 2008 Cambridge Silicon Radio Ltd. - * - * 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. - * - * 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, see <http://www.gnu.org/licenses/>. */ #include <linux/kernel.h> #include <linux/random.h> |