Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Mon, 19 May 2014 01:27:09 +0000 (21:27 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 19 May 2014 01:27:09 +0000 (21:27 -0400)
Included changes:
- fix codestyle to respect new checkpatch warnings
- increase internal version number


Trivial merge