diff options
author | Johannes Berg <johannes.berg@intel.com> | 2019-02-01 11:05:27 +0100 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2019-02-01 11:05:35 +0100 |
commit | 752cfee90d11e280d727617bf8d6df894141e157 (patch) | |
tree | c55feff5c93af364fe2212d6b2942abb3748e05c /drivers/net/phy/uPD60620.c | |
parent | cfg80211: fix typo (diff) | |
parent | r8169: improve WoL handling (diff) | |
download | linux-dev-752cfee90d11e280d727617bf8d6df894141e157.tar.xz linux-dev-752cfee90d11e280d727617bf8d6df894141e157.zip |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Merge net-next so that we get the changes from net, which would
otherwise conflict with the NLA_POLICY_NESTED/_ARRAY changes.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/phy/uPD60620.c')
-rw-r--r-- | drivers/net/phy/uPD60620.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/phy/uPD60620.c b/drivers/net/phy/uPD60620.c index 1e4fc42e4629..219fc7cdc2b3 100644 --- a/drivers/net/phy/uPD60620.c +++ b/drivers/net/phy/uPD60620.c @@ -1,13 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Driver for the Renesas PHY uPD60620. * * Copyright (C) 2015 Softing Industrial Automation GmbH - * - * 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. - * */ #include <linux/kernel.h> |