Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Mon, 2 May 2011 22:04:46 +0000 (15:04 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 2 May 2011 22:04:46 +0000 (15:04 -0700)
commitdcfd9cdc1222f14d6180514e533289493a0716fb
tree8a60386e7e55c44fc08c02506380989a3c83a166
parent5615787257742aab42ecf17c11e3244d9536a48d
parent32ae9b221e788413ce68feaae2ca39e406211a0a
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
net/batman-adv/soft-interface.c