diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-14 06:50:27 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-14 06:50:27 +0100 |
| commit | 853dc21bfe15f545347b5c82aad02735d552110d (patch) | |
| tree | e5881a889f67211727d0422d617d01a2c1495da6 /net/batman-adv/soft-interface.h | |
| parent | net: resort some Kbuild files to hopefully help avoid some conflicts (diff) | |
| parent | batman-adv: drop dependency against CRC16 (diff) | |
| download | linux-853dc21bfe15f545347b5c82aad02735d552110d.tar.xz linux-853dc21bfe15f545347b5c82aad02735d552110d.zip | |
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/soft-interface.h')
| -rw-r--r-- | net/batman-adv/soft-interface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index 4ab0167ac6ac..dbab22fd89a5 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: * * Marek Lindner * |