]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit13391508fcefff7fbb3cc7cae512c1e1232a1e2e
tree20f4d5b75bdffbf1945008aabec946b8ff3f5053
parent59c3534dd280d29d4fae988af8047e25955c36e5
parent9150b37e7619cd33901f23e0e3123e84b8aea50a
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