The following commit has been merged in the merge/master branch: commit b53c47dd4fdb3f062c07b1ba8a7f9f80237be182 Merge: f1e7b73acc26e8908af783bcd3a9900fd80688f5 a7966d908ae8472e8183496916b7baec5f65b3a6 Author: David S. Miller davem@davemloft.net Date: Tue Jan 29 15:59:45 2013 -0500

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