Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Thu, 3 Oct 2013 19:57:36 +0000 (15:57 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 Oct 2013 19:57:36 +0000 (15:57 -0400)
Included change:
- fix multi soft-interfaces setups with Network Coding enabled by
  registering the CODED packet type once only (instead of once per soft-if)

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

Trivial merge