From: David S. Miller Date: Tue, 25 Aug 2015 23:20:38 +0000 (-0700) Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b8766e4ed3e9fc6b27dc3ead029cd307caa926d2;p=deliverable%2Flinux.git Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge Antonio Quartulli says: ==================== Included changes: - code restyling and beautification - use int kernel types instead of C99 - update kereldoc - prevent potential hlist double deletion of VLAN objects - fix gw bandwidth calculation - convert list to hlist when needed - add lockdep_asserts calls in function with lock requirements described in kerneldoc ==================== Signed-off-by: David S. Miller --- b8766e4ed3e9fc6b27dc3ead029cd307caa926d2