From: David S. Miller Date: Fri, 24 Aug 2012 15:30:38 +0000 (-0400) Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge X-Git-Tag: upstream/snapshot3+hdmi~6565^2~288 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6e94e392fddb8845bdd2e199f55ebf7d76cb58d;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 --- e6e94e392fddb8845bdd2e199f55ebf7d76cb58d