Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Wed, 10 Jun 2015 03:23:52 +0000 (20:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 10 Jun 2015 03:23:52 +0000 (20:23 -0700)
commitc3eee1fb1d308564ada5f7ea57bc51efc6130b37
tree23fbf6e55aa23a1f4d92ba1441c885571faa7905
parent6651ee070b3124fe9b9db383e3a895a0e4aded65
parent94d1dd87316fdb7a403a2750e13ec839fd2fadea
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Antonio Quartulli says:

====================
Included changes:
- use common Jenkins hash instead of private implementation
- extend internal routing API
- properly re-arrange header files inclusion
- clarify precedence between '&' and '?'
- remove unused ethhdr variable in batadv_gw_dhcp_recipient_get()
- ensure per-VLAN structs are updated upon MAC change
====================

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