diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-10 06:23:52 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-10 06:23:52 +0300 |
| commit | c3eee1fb1d308564ada5f7ea57bc51efc6130b37 (patch) | |
| tree | 23fbf6e55aa23a1f4d92ba1441c885571faa7905 /net/mac80211/pm.c | |
| parent | 6651ee070b3124fe9b9db383e3a895a0e4aded65 (diff) | |
| parent | 94d1dd87316fdb7a403a2750e13ec839fd2fadea (diff) | |
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>
Diffstat (limited to 'net/mac80211/pm.c')
0 files changed, 0 insertions, 0 deletions