From: David S. Miller Date: Fri, 9 Jan 2015 04:14:32 +0000 (-0800) Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fb57720daf6e56ba453414b5e8dd9cb3c0c80257;p=linux-beck.git 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 --- fb57720daf6e56ba453414b5e8dd9cb3c0c80257