From: David S. Miller <davem@davemloft.net>
Date: Wed, 10 Jun 2015 03:23:52 +0000 (-0700)
Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
X-Git-Tag: v4.2-rc1~130^2~106
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=c3eee1fb1d308564ada5f7ea57bc51efc6130b37;p=linux-block.git

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

c3eee1fb1d308564ada5f7ea57bc51efc6130b37