summaryrefslogtreecommitdiff
path: root/net/batman-adv/icmp_socket.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-02-01 22:04:13 +0300
committerDavid S. Miller <davem@davemloft.net>2019-02-01 22:04:13 +0300
commitd3a5fd3c987c5e341bf78b79ef4d81080081b7d2 (patch)
treec3031332ea46d593fc5121679094c9873eda5ca7 /net/batman-adv/icmp_socket.c
parent962c382d482afc6280ff6f3c28331774bc331e1e (diff)
parent7a79d717e0817610932ce3b7b6033ea06ee1d577 (diff)
downloadlinux-d3a5fd3c987c5e341bf78b79ef4d81080081b7d2.tar.xz
Merge tag 'batadv-next-for-davem-20190201' 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 - Add DHCPACKs for DAT snooping, by Linus Luessing - Update copyright years for 2019, by Sven Eckelmann ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/icmp_socket.c')
-rw-r--r--net/batman-adv/icmp_socket.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c
index 6d5859714f52..9859ababb82e 100644
--- a/net/batman-adv/icmp_socket.c
+++ b/net/batman-adv/icmp_socket.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors:
*
* Marek Lindner
*