]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite205758d64764f9e25181cb8b277e9bf262af1d1
treec00ef9e9b447cd8b8a11c8d45a741d96e17570f2
parent94bd01f9256ad2b844e6a0708a22fa6e74aaf4b8
parent25929da1672fb5f40758748ef6fd2989b2628f88
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>