Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Sun, 8 May 2011 22:39:11 +0000 (15:39 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 8 May 2011 22:39:11 +0000 (15:39 -0700)
commit02e73c1edc3746e308d1768a27fdc8121f641ab1
treea3db8009e4549e3d85905e11ac2bf8e64df1763f
parentc5216cc70fa769e5a51837f2cf07c4a0aa734fcf
parent27aea2128ec09924dfe08e97739b2bf8b15c8619
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Documentation/networking/batman-adv.txt
net/batman-adv/soft-interface.c