Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Tue, 29 Jan 2013 20:59:45 +0000 (15:59 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 29 Jan 2013 20:59:45 +0000 (15:59 -0500)
Included changes:
- fix recently introduced output behaviour

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

Trivial merge