diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-24 13:19:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-24 13:19:53 -0400 |
| commit | d2abae71ebcc409828b24ce9da402548ecdf1311 (patch) | |
| tree | 5edfafc2828d3bcebb3698520ccba374cd4328c0 /net/mac80211/iface.c | |
| parent | 66567fcbaecac455caa1b13643155d686b51ce63 (diff) | |
| parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
Merge tag 'v5.2-rc6' into sched/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 410685d38c46..06aac0aaae64 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | /* | 2 | /* |
| 2 | * Interface handling | 3 | * Interface handling |
| 3 | * | 4 | * |
| @@ -8,10 +9,6 @@ | |||
| 8 | * Copyright 2013-2014 Intel Mobile Communications GmbH | 9 | * Copyright 2013-2014 Intel Mobile Communications GmbH |
| 9 | * Copyright (c) 2016 Intel Deutschland GmbH | 10 | * Copyright (c) 2016 Intel Deutschland GmbH |
| 10 | * Copyright (C) 2018 Intel Corporation | 11 | * Copyright (C) 2018 Intel Corporation |
| 11 | * | ||
| 12 | * This program is free software; you can redistribute it and/or modify | ||
| 13 | * it under the terms of the GNU General Public License version 2 as | ||
| 14 | * published by the Free Software Foundation. | ||
| 15 | */ | 12 | */ |
| 16 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
| 17 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |