diff options
author | Maarten Lankhorst | 2019-06-19 12:32:13 +0200 |
---|---|---|
committer | Maarten Lankhorst | 2019-06-19 12:32:13 +0200 |
commit | bcb7416e3480c1abb46266bdab874b3b3d6124cb (patch) | |
tree | 9d889b14957c0e266697d0674675bc42b0899571 /include/linux/netdevice.h | |
parent | drm/vc4: hdmi: Set default state margin at reset (diff) | |
parent | Merge v5.2-rc5 into drm-next (diff) | |
download | kernel-qcow2-linux-bcb7416e3480c1abb46266bdab874b3b3d6124cb.tar.gz kernel-qcow2-linux-bcb7416e3480c1abb46266bdab874b3b3d6124cb.tar.xz kernel-qcow2-linux-bcb7416e3480c1abb46266bdab874b3b3d6124cb.zip |
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
remove-fbcon-notifiers topic branch is based on rc4, so we need a fresh
backmerge of drm-next to pull it in.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 44b47e9df94a..eeacebd7debb 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * INET An implementation of the TCP/IP protocol suite for the LINUX * operating system. INET is implemented using the BSD Socket @@ -15,11 +16,6 @@ * Bjorn Ekwall. <bj0rn@blox.se> * Pekka Riikonen <priikone@poseidon.pspt.fi> * - * 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. - * * Moved to /usr/include/linux for NET3 */ #ifndef _LINUX_NETDEVICE_H |