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>
Showing
- drivers/bluetooth/ath3k.c 4 additions, 0 deletionsdrivers/bluetooth/ath3k.c
- drivers/bluetooth/btusb.c 2 additions, 0 deletionsdrivers/bluetooth/btusb.c
- drivers/net/ethernet/freescale/fec_ptp.c 3 additions, 0 deletionsdrivers/net/ethernet/freescale/fec_ptp.c
- drivers/net/ethernet/lantiq_etop.c 1 addition, 1 deletiondrivers/net/ethernet/lantiq_etop.c
- drivers/net/ethernet/mellanox/mlx4/en_netdev.c 11 additions, 11 deletionsdrivers/net/ethernet/mellanox/mlx4/en_netdev.c
- drivers/net/ethernet/mellanox/mlx4/eq.c 1 addition, 1 deletiondrivers/net/ethernet/mellanox/mlx4/eq.c
- drivers/net/ethernet/mellanox/mlx4/resource_tracker.c 35 additions, 10 deletionsdrivers/net/ethernet/mellanox/mlx4/resource_tracker.c
- drivers/net/ethernet/ti/cpsw.c 1 addition, 1 deletiondrivers/net/ethernet/ti/cpsw.c
- drivers/net/wireless/ath/ath9k/ar9003_calib.c 4 additions, 0 deletionsdrivers/net/wireless/ath/ath9k/ar9003_calib.c
- drivers/net/wireless/ath/ath9k/link.c 13 additions, 13 deletionsdrivers/net/wireless/ath/ath9k/link.c
- drivers/net/wireless/iwlegacy/3945-mac.c 12 additions, 10 deletionsdrivers/net/wireless/iwlegacy/3945-mac.c
- drivers/net/wireless/mwifiex/cmdevt.c 16 additions, 6 deletionsdrivers/net/wireless/mwifiex/cmdevt.c
- drivers/net/wireless/mwifiex/init.c 8 additions, 0 deletionsdrivers/net/wireless/mwifiex/init.c
- drivers/net/wireless/mwifiex/main.h 2 additions, 2 deletionsdrivers/net/wireless/mwifiex/main.h
- drivers/net/wireless/mwifiex/scan.c 4 additions, 4 deletionsdrivers/net/wireless/mwifiex/scan.c
- drivers/net/wireless/mwifiex/sta_ioctl.c 2 additions, 8 deletionsdrivers/net/wireless/mwifiex/sta_ioctl.c
- drivers/net/wireless/rtlwifi/usb.c 1 addition, 0 deletionsdrivers/net/wireless/rtlwifi/usb.c
- include/linux/thermal.h 1 addition, 1 deletioninclude/linux/thermal.h
- include/uapi/linux/packet_diag.h 3 additions, 1 deletioninclude/uapi/linux/packet_diag.h
- include/uapi/linux/unix_diag.h 3 additions, 1 deletioninclude/uapi/linux/unix_diag.h
Loading
Please register or sign in to comment