diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-28 15:07:52 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-28 15:07:52 -0500 |
| commit | 0695512a57a8ad5c0495b2a3b23b3216434e3f92 (patch) | |
| tree | dcf2cfb60274bcb9428d9ca054bb916f388ba2dc /net/batman-adv/main.c | |
| parent | 5bd49735db39c1c1360cb91b1f1e1c999d90eb94 (diff) | |
| parent | 7c64fd98ce512de6c6dae0452dc026446bd368d5 (diff) | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Diffstat (limited to 'net/batman-adv/main.c')
| -rw-r--r-- | net/batman-adv/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 8ae497b26bd..08f3b3a8e88 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * |