The following commit has been merged in the master branch: commit 7dff08bbda1610697a350eeb7dcdc6177d229407 Merge: fb1d598d482d9fd448ea68895751bdfb8f29ee8e 1b371d13071d6b6b9dc7a00fe1bc5a6babd68a5b Author: David S. Miller davem@davemloft.net Date: Thu Jan 16 17:22:58 2014 -0800

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