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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQEcBAABAgAGBQJPrQCdAAoJEFMQTLzJFOZFabwH/Rb0228L90+mCvntxbjOCgIt
 kmxbm1sJGpDUvkqB5sYCrpcvnVaogXvn30afq+DUQfh3UKd31S73pcvISV+0NpCg
 0xNxFOGEk2WYo1e80rYsyaMJg48grFqrBRlPINY9VxEDbAyGBPbIS0TveBCgMDiU
 mDLRsilphTD0uQRv3MsVtNHwJK0oF7+i9QLMqFmeu9lKHiBNA08EQkZqwTZK/wxH
 02M6HNQkVcK65zahla8R3pwWTKHxAC1A8hdfwPZq43WCWGvvFMdn5VNmeKlC0NC9
 Upe6k9tGftiluB0IhuKDA2qicYv+G1xvQWeSTwf9xbFzo21AKpSFYAqoksAGMHg=
 =C3x/
 -----END PGP SIGNATURE-----

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
This commit is contained in:
David S. Miller 2012-05-11 17:57:52 -04:00
commit 16c788dee1
18 changed files with 380 additions and 265 deletions