tree 3d7d1ab9a4ddfc442f2e56e887671ba8e24a0a7e
parent 7cc163806b0dc31ea2067d48a2732b452a709f48
parent 2df5278b0267c799f3e877e8eeddbb6e93cda0bb
author David S. Miller <davem@davemloft.net> 1363276035 -0400
committer David S. Miller <davem@davemloft.net> 1363276035 -0400
mergetag object 2df5278b0267c799f3e877e8eeddbb6e93cda0bb
 type commit
 tag batman-adv-for-davem
 tagger Antonio Quartulli <ordex@autistici.org> 1363214570 +0100
 
 Included changes:
 - introduction of the new Network Coding component. This new mechanism aims to
   increase throughput by fusing multiple packets in one transmission.
 - minor cleanups
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQIcBAABCAAGBQJRQQEWAAoJEADl0hg6qKeOStEP/0JSLJBV8woALOEpQenmoYld
 BvcQd7ZrkupYjgk12H2EQg0yzU05M+svCgoENTGzx/Fdu1NkZoWeGJ2RZ8iSyuyb
 KfPPNRsJZc3zs3xRCFglGHlfGiDPxzHB40MOIft/oLgVq73Z0ICGpOa6fStK/Pbl
 qRYTNzq8SHJnt5hRqXZPpSjYd9pQu6RTrwje8uz7F8PtzJjDdPNToaM94Cpa3fwZ
 vP6ClfADVl6QfQ0C0I6NbkKnbM+LcB8NFGvc1KDatvyjKpbmpgJv/DZDimN6WDhD
 o61zPeI7p0zpSC/g62Elnk/NS9kkYvV0U3IWaWonwU7mOaZp3v+sdxEgj8fUTy/l
 Rk2p7GPgJ8/k0SGkOmzDOxQl7CZHG/+Wqmgj9TS+a7yOnxNt8dj8JT6a0wxOWYW/
 H7rU0gV2Sj/0vpm/wHldpa43LN13dkqGTUohNgvzSDa07vSSZMN0mI7q39mK7FL7
 pwUaohSVALNco6QfLLizdmd7mepNkXVYPmDD/eWcexHQ377R9vk1e8O4fj848iTK
 i2PX/FpmU90sGnFfN0ESg7E3GLXa+5B6ogAiSDUvx2Mow0z+LvZNrqKf9KiOgl2d
 nPIkNbHc48njRE7OYRJzbpks5dhFP69sVJenZjVuwuKL4Oyg/J2gKrCeVHWYQXKG
 7ocAjEsWs+uZ2TNCPYxK
 =icrn
 -----END PGP SIGNATURE-----

Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Included changes:
- introduction of the new Network Coding component. This new mechanism aims to
  increase throughput by fusing multiple packets in one transmission.
- minor cleanups

Signed-off-by: David S. Miller <davem@davemloft.net>