Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Sun, 31 May 2015 08:07:06 +0000 (01:07 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 31 May 2015 08:07:06 +0000 (01:07 -0700)
commita9ab2184f451ec78af245ebb8b663d8700d44672
tree2d7c40031306c541dc28b798bdc3aaea8f90c48f
parentabf2e7d6e2e315b32ee00067a69aaad2cf4e1b3f
parent8ea64e27080eb66dc26f64f28485c0bc9fc06b36
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Antonio Quartulli says:

====================
Included changes:
- checkpatch fixes
- code cleanup
- debugfs component is now compiled only if DEBUG_FS is selected
- update copyright years
- disable by default not-so-user-safe features
====================

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