Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Mon, 18 Apr 2011 00:37:29 +0000 (17:37 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 18 Apr 2011 00:37:29 +0000 (17:37 -0700)
1  2 
net/batman-adv/soft-interface.c

Simple merge