From: David S. Miller <davem@davemloft.net>
Date: Wed, 31 Oct 2012 17:52:52 +0000 (-0400)
Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=157083811c933fc223a3193d319c7ac805f30bb7;p=deliverable%2Flinux.git

Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

included changes:
- some code cleanups and minor fixes (3 of them were reported by Coverity)
- 'struct hard_iface' re-shaping to improve multi-protocol support
- ECTP packets silent drop
- transfer the WIFI flag on clients in case of roaming
---

157083811c933fc223a3193d319c7ac805f30bb7