diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-25 16:15:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-25 16:18:10 -0700 |
| commit | 1d5873e9d75bb72012a6c1327a368d0d2b13581f (patch) | |
| tree | 20f4d5b75bdffbf1945008aabec946b8ff3f5053 /net/8021q/vlan.h | |
| parent | 7665de15642dfb1709177517aa0488162727342c (diff) | |
| parent | a513088d022c8f59cebe17c567797c220563b517 (diff) | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Included changes:
- yet another batch of 'namespace cleaning' patches
Conflicts:
net/batman-adv/translation-table.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan.h')
0 files changed, 0 insertions, 0 deletions