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)
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>

Trivial merge