From: David S. Miller <davem@davemloft.net>
Date: Sat, 22 Jun 2019 12:59:24 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=92ad6325cb891bb455487bfe90cc47d18aa6ec37;p=openwrt%2Fstaging%2Fblogic.git

Merge git://git./linux/kernel/git/davem/net

Minor SPDX change conflict.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

92ad6325cb891bb455487bfe90cc47d18aa6ec37
diff --cc net/mac80211/sta_info.c
index 315adb473e2c,187f62a48b2b..95eb8220e2e4
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@@ -3,11 -4,7 +4,7 @@@
   * Copyright 2006-2007	Jiri Benc <jbenc@suse.cz>
   * Copyright 2013-2014  Intel Mobile Communications GmbH
   * Copyright (C) 2015 - 2017 Intel Deutschland GmbH
 - * Copyright (C) 2018 Intel Corporation
 + * Copyright (C) 2018-2019 Intel Corporation
-  *
-  * 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/module.h>