Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Mon, 25 Jun 2012 23:15:58 +0000 (16:15 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 Jun 2012 23:18:10 +0000 (16:18 -0700)
commit1d5873e9d75bb72012a6c1327a368d0d2b13581f
tree20f4d5b75bdffbf1945008aabec946b8ff3f5053
parent7665de15642dfb1709177517aa0488162727342c
parenta513088d022c8f59cebe17c567797c220563b517
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>
net/batman-adv/translation-table.c