From: David S. Miller <davem@davemloft.net>
Date: Fri, 17 Jan 2014 01:22:58 +0000 (-0800)
Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
X-Git-Tag: v3.14-rc1~94^2~122
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7dff08bbda1610697a350eeb7dcdc6177d229407;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Included change:
- properly format already existing kerneldoc

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

7dff08bbda1610697a350eeb7dcdc6177d229407