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)
commitb6052af61a9e0dee236bcf4c69843126c0d28e4f
tree40b7a1182bf2897641171d2f47cd5d9b0ff5cdf9
parent38ea4e6e4a21fb88104be2a666a7e88176150b00
parent871d3d9fdf1c2fb58927080c8e96edccb1fee010
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Included changes:
- fix codestyle to respect new checkpatch warnings
- increase internal version number