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)
commite6e94e392fddb8845bdd2e199f55ebf7d76cb58d
treeb700374a014145367551448027eaf2fc74cfc391
parentf63c45e0e63fd1bccb6d021fe4de20f82114a024
parentfa4f0afcf40361bf67ed3abd520a5fbe12d11166
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

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>