From: David S. Miller <davem@davemloft.net>
Date: Mon, 19 May 2014 01:27:09 +0000 (-0400)
Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
X-Git-Tag: v3.16-rc1~27^2~190
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6052af;p=thirdparty%2Flinux.git

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

b6052af61a9e0dee236bcf4c69843126c0d28e4f