]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Fri, 11 May 2012 21:57:52 +0000 (17:57 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 11 May 2012 21:57:52 +0000 (17:57 -0400)
commit45374324ecb222d0c48e10a1ec0d9c47cae7ba52
treeebf3db929e39946d44377be7683156fed8f8bc3d
parent1d4e1a73fb3b01d0d3b5af6ae36a344c22d7c7ca
parentca2f0815a35997c5975e3510b64c884ba857b352
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Included changes:

* fix a little bug in the DHCP packet snooping introduced so far
* minor fixes and cleanups
* minor routing protocol API cleanups
* add a new contributor name to translation-table.{c,h}
* update copyright years in file headers
* minor improvement for the routing algorithm