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)
commite8abbe0d0236ac1d55d21fec7a8d2ee03e9d3258
tree222115ab13209862ffdf35c11c9f7923a059188c
parentbb092c0db883d435d9d774e10b4cf71f12aad122
parent40e0c4f51d3fc3fd54edc797adae314fbe2b96a6
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
net/batman-adv/soft-interface.c