Merge branch 'nps_ent-coding-style'
authorDavid S. Miller <davem@davemloft.net>
Thu, 14 Jul 2016 03:59:07 +0000 (20:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 14 Jul 2016 03:59:07 +0000 (20:59 -0700)
Elad Kanfi says:

====================
Code style fixes

Fix all checkpatch warnings and errors, and reuse code
====================

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

Trivial merge