Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Sun, 7 Feb 2016 19:32:50 +0000 (14:32 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 7 Feb 2016 19:32:50 +0000 (14:32 -0500)
commit9d1eb21b59967b337695ed6df66c6d225e3019e0
treea5d66cd49ba9c8a3afb44109438e7a483f6810d4
parente63591933b16689268dac5db9cb2cab29c8dce54
parent7b5e73961915438d623cb80eea97868b3a66cc48
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Antonio Quartulli says:

====================
This batch of patches includes a number of corrections and
improvements for our kernel-doc. These changes also make sure
that our doc is now properly processed by the kernel-doc
parsing tool.

Other than that you have a patch updating all the copyright
lines to 2016 and another patch switching the URLs in our
readme, Kconfig and MAINTAINERS file from "http" to "https".
Both by Sven Eckelmann.
====================

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