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)
1  2 
Documentation/networking/batman-adv.txt
net/batman-adv/soft-interface.c

Simple merge