Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Fri, 17 Jan 2014 01:22:58 +0000 (17:22 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 17 Jan 2014 01:22:58 +0000 (17:22 -0800)
Included change:
- properly format already existing kerneldoc

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge