summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/vis.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-01-31 13:24:56 -0800
committerDavid S. Miller <davem@davemloft.net>2011-01-31 13:24:56 -0800
commita5e3c2aae23a3719105c1ae662c67ef282f213db (patch)
treef951e78782757dfc2d4b7015601f65101ac2ef73 /net/batman-adv/vis.c
parent6b28ff3be829a851378551245fd6b3f9bf93b0ad (diff)
parent091b948306d2628320e77977eb7ae4a757b12180 (diff)
downloadblackbird-obmc-linux-a5e3c2aae23a3719105c1ae662c67ef282f213db.tar.gz
blackbird-obmc-linux-a5e3c2aae23a3719105c1ae662c67ef282f213db.zip
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Diffstat (limited to 'net/batman-adv/vis.c')
-rw-r--r--net/batman-adv/vis.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c
index de1022cacaf7..7db9ad82cc00 100644
--- a/net/batman-adv/vis.c
+++ b/net/batman-adv/vis.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2010 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2008-2011 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
*
OpenPOWER on IntegriCloud