Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Sun, 11 Mar 2012 22:36:34 +0000 (15:36 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 11 Mar 2012 22:36:34 +0000 (15:36 -0700)
1  2 
net/batman-adv/soft-interface.c

Simple merge