]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Fri, 24 Aug 2012 15:30:38 +0000 (11:30 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 Aug 2012 15:30:50 +0000 (11:30 -0400)
Antonio Quartulli says:

====================
Included changes:
- a set of codestyle rearrangements/fixes
- new feature to early detect new joining (mesh-unaware) clients
- a minor fix for the gw-feature
- substitution of shift operations with the BIT() macro
- reorganization of the main batman-adv structure (struct batadv_priv)
- some more (very) minor cleanups and fixes
===================

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

Trivial merge