Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

diff --cc drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c
Simple merge

diff --cc drivers/net/usb/qmi_wwan.c
Simple merge

diff --cc drivers/net/usb/r8152.c
Simple merge

diff --cc drivers/net/vrf.c
Simple merge

diff --cc include/linux/filter.h
Simple merge

diff --cc include/net/l3mdev.h
Simple merge

diff --cc net/bridge/br_stp_if.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/ipv4/udp.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge