Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Tue, 25 Aug 2015 23:20:38 +0000 (16:20 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 25 Aug 2015 23:20:38 +0000 (16:20 -0700)
commitb8766e4ed3e9fc6b27dc3ead029cd307caa926d2
tree5d115c3fcaec9ddb3d47663e621e138dc3fcbc99
parentdafc21995db9b2ef61a2d613f872a5c565731548
parent854d2a63de86a769db4dbed75b660f544b3c0c7a
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 <davem@davemloft.net>