Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Wed, 18 Sep 2013 16:22:17 +0000 (12:22 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Sep 2013 16:22:17 +0000 (12:22 -0400)
commit4bdc944729032c9eb8aabadc7f36c01d83fd34e5
tree4ea1fffb7fe7d3c917257e8fc28d0d4de25e47d3
parent61c5923a2f2d8ab98a1e3c76f17e0f4a871ec75b
parent4c18c425b2d228415b635e97a64737d7f27c5536
Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge

Included change:
- fix the Bridge Loop Avoidance component by marking the variables containing
  the VLAN ID with the HAS_TAG flag when needed.