summaryrefslogtreecommitdiffstats
path: root/Documentation/networking
diff options
context:
space:
mode:
authorDavid S. Miller2017-12-20 20:33:03 +0100
committerDavid S. Miller2017-12-20 20:33:03 +0100
commita943e8bc058977663ba1e42389d4f5643cf2ae9e (patch)
treeae8ba5ef07e3edec4d6626137b2ebcf1c6329fd7 /Documentation/networking
parentMerge branch 'replace-tcp_set_state-tracepoint-with-inet_sock_set_state' (diff)
parentbatman-adv: Add kernel-doc to externally visible functions (diff)
downloadkernel-qcow2-linux-a943e8bc058977663ba1e42389d4f5643cf2ae9e.tar.gz
kernel-qcow2-linux-a943e8bc058977663ba1e42389d4f5643cf2ae9e.tar.xz
kernel-qcow2-linux-a943e8bc058977663ba1e42389d4f5643cf2ae9e.zip
Merge tag 'batadv-next-for-davem-20171220' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says: ==================== This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - de-inline hash functions to save memory footprint, by Denys Vlasenko - Add License information to various files, by Sven Eckelmann (3 patches) - Change batman_adv.h from ISC to MIT, by Sven Eckelmann - Improve various includes, by Sven Eckelmann (5 patches) - Lots of kernel-doc work by Sven Eckelmann (8 patches) ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/networking')
-rw-r--r--Documentation/networking/batman-adv.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/networking/batman-adv.rst b/Documentation/networking/batman-adv.rst
index a342b2cc3dc6..245fb6c0ab6f 100644
--- a/Documentation/networking/batman-adv.rst
+++ b/Documentation/networking/batman-adv.rst
@@ -1,3 +1,5 @@
+.. SPDX-License-Identifier: GPL-2.0
+
==========
batman-adv
==========