Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Tue, 28 Feb 2012 20:07:52 +0000 (15:07 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 28 Feb 2012 20:07:52 +0000 (15:07 -0500)
1  2 
net/batman-adv/soft-interface.c

Simple merge