diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-05-28 09:38:59 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-05-28 09:39:08 +0200 |
| commit | 4672b1d65fc9b5a5ded911fbebb4853b892d5d89 (patch) | |
| tree | 4ddeeb9fd195ce85f0f49525b94c39bdee8b94d9 /net/decnet/af_decnet.c | |
| parent | cf57fdc8e42bd88dae1213a2bbe683d4b6c2190b (diff) | |
| parent | 14ee642c2ab0a3d8a1ded11fade692d8b77172b9 (diff) | |
| download | linux-4672b1d65fc9b5a5ded911fbebb4853b892d5d89.tar.gz | |
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
This picks up rc2 for us as well. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'net/decnet/af_decnet.c')
| -rw-r--r-- | net/decnet/af_decnet.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index c1fa4785c4c2..0ea75286abf4 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * DECnet An implementation of the DECnet protocol suite for the LINUX @@ -46,15 +47,6 @@ /****************************************************************************** (c) 1995-1998 E.M. Serrat emserrat@geocities.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 - any later version. - - 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. HISTORY: |