]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 420ce5f 15c347d)
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)
commit4d8c470cd001b1cbece5f6fe127520aabce20e58
treec00ef9e9b447cd8b8a11c8d45a741d96e17570f2tree | snapshot
parent420ce5f36049d5b8ae343d2c41dde0e63fa8ccffcommit | diff
parent15c347db4827a8064989ab1cef3b11d454ab2e41commit | diff
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>
Linux Kernel Source Tree.