aboutsummaryrefslogtreecommitdiff
path: root/net/batman-adv/bitarray.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-01-13 21:50:27 -0800
committerDavid S. Miller <davem@davemloft.net>2014-01-13 21:50:27 -0800
commit853dc21bfe15f545347b5c82aad02735d552110d (patch)
treee5881a889f67211727d0422d617d01a2c1495da6 /net/batman-adv/bitarray.c
parent6806afc9aa1000db598e31164d2ef505be3b3075 (diff)
parent12afc36e38b3b6a0ec9bda71632c2285e7fdbab2 (diff)
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Included changes: - drop dependency against CRC16 - move to new release version - add size check at compile time for packet structs - update copyright years in every file - implement new bonding/interface alternation feature Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/bitarray.c')
-rw-r--r--net/batman-adv/bitarray.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c
index 89d3a5bcacc1..9586750022f5 100644
--- a/net/batman-adv/bitarray.c
+++ b/net/batman-adv/bitarray.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2013 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2006-2014 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich, Marek Lindner
*