From: David S. Miller <davem@davemloft.net>
Date: Wed, 18 Sep 2013 16:22:17 +0000 (-0400)
Subject: Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge
X-Git-Tag: v3.12-rc2~14^2~9
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4bdc944729032c9eb8aabadc7f36c01d83fd34e5;p=linux.git

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.
---

4bdc944729032c9eb8aabadc7f36c01d83fd34e5