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)
Included change:
- fix the Bridge Loop Avoidance component by marking the variables containing
  the VLAN ID with the HAS_TAG flag when needed.


Trivial merge