]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 22 Mar 2013 16:53:09 +0000 (12:53 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 22 Mar 2013 16:53:09 +0000 (12:53 -0400)
commit9f25839cc497fcc38bbc335bfd113fb00d26a74d
treea5b4cd52ec5e27d169bf3115d732d2106bc78fc2
parentf5ba7166f62dbb84409be6843c84227eec77717d
parent7c06f07feacf1763594f86f40a25903397a4ef1f
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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>
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