commit | 16c788dee1934c2cc4e98692a5a63132d6e07d50 | [log] [tgz] |
---|---|---|
author | David S. Miller <davem@davemloft.net> | Fri May 11 17:57:52 2012 -0400 |
committer | David S. Miller <davem@davemloft.net> | Fri May 11 17:57:52 2012 -0400 |
tree | ebf3db929e39946d44377be7683156fed8f8bc3d | |
parent | 06a4c1c55dbe5d9f7a708e8f1a52fd2ac8e5874f [diff] | |
parent | 35c133a000d54b7e3fe81e8c8e4b8af5878ad6dd [diff] |
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