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)
commitb53c47dd4fdb3f062c07b1ba8a7f9f80237be182
treef34f3c260c2f089f0ed89faeddba43771fd21694
parentf1e7b73acc26e8908af783bcd3a9900fd80688f5
parenta7966d908ae8472e8183496916b7baec5f65b3a6
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Included changes:
- fix recently introduced output behaviour

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