Merge branch 'drm-fixes-5.2' of git://people.freedesktop.org/~agd5f/linux into drm...

[sfrench/cifs-2.6.git] / net / ipv6 / ndisc.c

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 4c8e2ea8bf193ac006a7dcb4e7e94dff2a394b0e..09dd2edfb86809386fc475453e42a5993685c20f 100644 (file)
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *     Neighbour Discovery for IPv6
  *     Linux INET6 implementation
@@ -5,11 +6,6 @@
  *     Authors:
  *     Pedro Roque             <roque@di.fc.ul.pt>
  *     Mike Shaver             <shaver@ingenia.com>
- *
- *     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.
  */
 
 /*