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: omap-for-v3.16/fixes-against-rc1~36^2~190
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6052af61a9e0dee236bcf4c69843126c0d28e4f;p=pandora-kernel.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
Reading git-diff-tree failed