Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Thu, 14 Mar 2013 15:47:15 +0000 (11:47 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 14 Mar 2013 15:47:15 +0000 (11:47 -0400)
commit1e32b0c65c9e3f1a09cb5d1bcc0c5becf849d85f
tree3d7d1ab9a4ddfc442f2e56e887671ba8e24a0a7e
parent7cc163806b0dc31ea2067d48a2732b452a709f48
parent2df5278b0267c799f3e877e8eeddbb6e93cda0bb
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>