Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David S. Miller [Fri, 22 Mar 2013 16:53:09 +0000 (12:53 -0400)]
Pull to get the thermal netlink multicast group name fix, otherwise
the assertion added in net-next to netlink to detect that kind of bug
makes systems unbootable for some folks.

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

1  2 
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
drivers/net/ethernet/ti/cpsw.c
drivers/net/wireless/iwlegacy/3945-mac.c
drivers/net/wireless/mwifiex/cmdevt.c
drivers/net/wireless/mwifiex/init.c
drivers/net/wireless/mwifiex/main.h
drivers/net/wireless/mwifiex/sta_ioctl.c
drivers/net/wireless/rtlwifi/usb.c
net/ipv4/tcp_output.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge