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

Trivial merge