batman-adv: update copyright years for 2015

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>

diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile
index eb7d8c0..79833eb 100644 (file)
--- a/net/batman-adv/Makefile
+++ b/net/batman-adv/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2014 B.A.T.M.A.N. contributors:
+# Copyright (C) 2007-2015 B.A.T.M.A.N. contributors:
 #
 # Marek Lindner, Simon Wunderlich
 #

diff --cc net/batman-adv/bat_algo.h
Simple merge

diff --cc net/batman-adv/bat_iv_ogm.c
Simple merge

diff --cc net/batman-adv/bitarray.c
Simple merge

diff --cc net/batman-adv/bitarray.h
Simple merge

diff --cc net/batman-adv/bridge_loop_avoidance.c
Simple merge

diff --cc net/batman-adv/bridge_loop_avoidance.h
Simple merge

diff --cc net/batman-adv/debugfs.c
Simple merge

diff --cc net/batman-adv/debugfs.h
Simple merge

diff --cc net/batman-adv/distributed-arp-table.c
Simple merge

diff --cc net/batman-adv/distributed-arp-table.h
Simple merge

diff --cc net/batman-adv/fragmentation.c
Simple merge

diff --cc net/batman-adv/fragmentation.h
Simple merge

diff --cc net/batman-adv/gateway_client.c
Simple merge

diff --cc net/batman-adv/gateway_client.h
Simple merge

diff --cc net/batman-adv/gateway_common.c
Simple merge

diff --cc net/batman-adv/gateway_common.h
Simple merge

diff --cc net/batman-adv/hard-interface.c
Simple merge

diff --cc net/batman-adv/hard-interface.h
Simple merge

diff --cc net/batman-adv/hash.c
Simple merge

diff --cc net/batman-adv/hash.h
Simple merge

diff --cc net/batman-adv/icmp_socket.c
Simple merge

diff --cc net/batman-adv/icmp_socket.h
Simple merge

diff --cc net/batman-adv/main.c
Simple merge

diff --cc net/batman-adv/main.h
Simple merge

diff --cc net/batman-adv/multicast.c
Simple merge

diff --cc net/batman-adv/multicast.h
Simple merge

diff --cc net/batman-adv/network-coding.c
Simple merge

diff --cc net/batman-adv/network-coding.h
Simple merge

diff --cc net/batman-adv/originator.c
Simple merge

diff --cc net/batman-adv/originator.h
Simple merge

diff --cc net/batman-adv/packet.h
Simple merge

diff --cc net/batman-adv/routing.c
Simple merge

diff --cc net/batman-adv/routing.h
Simple merge

diff --cc net/batman-adv/send.c
Simple merge

diff --cc net/batman-adv/send.h
Simple merge

diff --cc net/batman-adv/soft-interface.c
Simple merge

diff --cc net/batman-adv/soft-interface.h
Simple merge

diff --cc net/batman-adv/sysfs.c
Simple merge

diff --cc net/batman-adv/sysfs.h
Simple merge

diff --cc net/batman-adv/translation-table.c
Simple merge

diff --cc net/batman-adv/translation-table.h
Simple merge

diff --cc net/batman-adv/types.h
Simple merge