diff options
author | David S. Miller <davem@davemloft.net> | 2012-08-24 11:30:38 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-08-24 11:30:50 -0400 |
commit | e6e94e392fddb8845bdd2e199f55ebf7d76cb58d (patch) | |
tree | b700374a014145367551448027eaf2fc74cfc391 /net/core/sock.c | |
parent | f63c45e0e63fd1bccb6d021fe4de20f82114a024 (diff) | |
parent | fa4f0afcf40361bf67ed3abd520a5fbe12d11166 (diff) | |
download | op-kernel-dev-e6e94e392fddb8845bdd2e199f55ebf7d76cb58d.zip op-kernel-dev-e6e94e392fddb8845bdd2e199f55ebf7d76cb58d.tar.gz |
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>
Diffstat (limited to 'net/core/sock.c')
0 files changed, 0 insertions, 0 deletions