| commit | fb57720daf6e56ba453414b5e8dd9cb3c0c80257 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Jan 08 20:14:32 2015 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Thu Jan 08 20:14:32 2015 -0800 |
| tree | c00ef9e9b447cd8b8a11c8d45a741d96e17570f2 | |
| parent | f40e74ffa3de44f7ef4c09653b070dd115ab7fbe [diff] | |
| parent | 9535395640edb23ba5cec2abb026c4ee51899722 [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>