]> Pileus Git - ~andy/linux/commitdiff
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Tue, 14 Jan 2014 05:50:27 +0000 (21:50 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Jan 2014 05:50:27 +0000 (21:50 -0800)
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>

Trivial merge