diff options
author | David S. Miller <davem@davemloft.net> | 2011-01-31 13:24:56 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-31 13:24:56 -0800 |
commit | a5e3c2aae23a3719105c1ae662c67ef282f213db (patch) | |
tree | f951e78782757dfc2d4b7015601f65101ac2ef73 /net/batman-adv/icmp_socket.h | |
parent | 6b28ff3be829a851378551245fd6b3f9bf93b0ad (diff) | |
parent | 091b948306d2628320e77977eb7ae4a757b12180 (diff) |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Diffstat (limited to 'net/batman-adv/icmp_socket.h')
-rw-r--r-- | net/batman-adv/icmp_socket.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/icmp_socket.h b/net/batman-adv/icmp_socket.h index bf9b348cde27..08b185959501 100644 --- a/net/batman-adv/icmp_socket.h +++ b/net/batman-adv/icmp_socket.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: * * Marek Lindner * |