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

Synchronize with 'net' in order to sort out some l2tp, wireless, and
ipv6 GRE fixes that will be built on top of in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/bcma/bcma_private.h
Simple merge

diff --cc drivers/bcma/driver_gpio.c
Simple merge

diff --cc drivers/bcma/main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/main.c
Simple merge

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

diff --cc drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmsmac/main.c
Simple merge

diff --cc drivers/net/xen-netback/interface.c
Simple merge

diff --cc drivers/ssb/driver_gpio.c
Simple merge

diff --cc drivers/ssb/main.c
Simple merge

diff --cc drivers/ssb/ssb_private.h
Simple merge

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

diff --cc net/ipv6/ip6_gre.c
Simple merge

diff --cc net/l2tp/l2tp_core.c
Simple merge

diff --cc net/sctp/auth.c
Simple merge