projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[linux-2.6-block.git]
/
net
/
batman-adv
/
distributed-arp-table.c
diff --git
a/net/batman-adv/distributed-arp-table.c
b/net/batman-adv/distributed-arp-table.c
index 183f97a86bb24c8099f4d3b7b7d4a5919d3432c4..ea0bd31d41c2671e25d2f5f539d5aa823f743b9a 100644
(file)
--- a/
net/batman-adv/distributed-arp-table.c
+++ b/
net/batman-adv/distributed-arp-table.c
@@
-1,4
+1,4
@@
-/* Copyright (C) 2011-201
2
B.A.T.M.A.N. contributors:
+/* Copyright (C) 2011-201
3
B.A.T.M.A.N. contributors:
*
* Antonio Quartulli
*