Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Fri, 9 Jan 2015 04:14:32 +0000 (20:14 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 9 Jan 2015 04:14:32 +0000 (20:14 -0800)
commitfb57720daf6e56ba453414b5e8dd9cb3c0c80257
treec00ef9e9b447cd8b8a11c8d45a741d96e17570f2
parentf40e74ffa3de44f7ef4c09653b070dd115ab7fbe
parent9535395640edb23ba5cec2abb026c4ee51899722
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Included changes:
- remove useless return in void functions
- remove unused member 'primary_iface' from 'struct orig_node'
- improve existing kernel doc
- fix several checkpatch complaints
- ensure socket's control block is cleared for received skbs
- add missing DEBUG_FS dependency to BATMAN_ADV_DEBUG symbol

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