From: David S. Miller <davem@davemloft.net>
Date: Sun, 31 May 2015 08:07:06 +0000 (-0700)
Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~134^2~174
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9ab2184f451ec78af245ebb8b663d8700d44672;p=pandora-kernel.git

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

a9ab2184f451ec78af245ebb8b663d8700d44672