From: David S. Miller <davem@davemloft.net>
Date: Wed, 18 Apr 2012 17:21:59 +0000 (-0400)
Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~13228^2~411
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=91fbe33034c184c6a60e31c2207a2f7ec2f180dc;p=mirror_ubuntu-zesty-kernel.git

Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Included changes:
* remove duplicated line in comment
* add htons() invocation for tt_crc as suggested by Al Viro
* OriGinator Message seqno initial value is now random
* some cleanups and fixes
---

91fbe33034c184c6a60e31c2207a2f7ec2f180dc