From: David S. Miller <davem@davemloft.net>
Date: Fri, 11 May 2012 21:57:52 +0000 (-0400)
Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=16c788dee1934c2cc4e98692a5a63132d6e07d50;p=openwrt%2Fstaging%2Fblogic.git

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
---

16c788dee1934c2cc4e98692a5a63132d6e07d50