Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits) tg3: Fix single-vector MSI-X code openvswitch: Fix multipart datapath dumps. ipv6: fix per device IP snmp counters inetpeer: initialize ->redirect_genid in inet_getpeer() net: fix NULL-deref in WARN() in skb_gso_segment() net: WARN if skb_checksum_help() is called on skb requiring segmentation caif: Remove bad WARN_ON in caif_dev caif: Fix typo in Vendor/Product-ID for CAIF modems bnx2x: Disable AN KR work-around for BCM57810 bnx2x: Remove AutoGrEEEn for BCM84833 bnx2x: Remove 100Mb force speed for BCM84833 bnx2x: Fix PFC setting on BCM57840 bnx2x: Fix Super-Isolate mode for BCM84833 net: fix some sparse errors net: kill duplicate included header net: sh-eth: Fix build error by the value which is not defined net: Use device model to get driver name in skb_gso_segment() bridge: BH already disabled in br_fdb_cleanup() net: move sock_update_memcg outside of CONFIG_INET mwl8k: Fixing Sparse ENDIAN CHECK warning ...
No related branches found
No related tags found
Showing
- Documentation/devices.txt 3 additions, 0 deletionsDocumentation/devices.txt
- MAINTAINERS 8 additions, 7 deletionsMAINTAINERS
- drivers/bcma/bcma_private.h 1 addition, 0 deletionsdrivers/bcma/bcma_private.h
- drivers/bcma/host_pci.c 18 additions, 25 deletionsdrivers/bcma/host_pci.c
- drivers/bcma/main.c 24 additions, 0 deletionsdrivers/bcma/main.c
- drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c 6 additions, 1 deletiondrivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c 169 additions, 129 deletionsdrivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
- drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h 1 addition, 0 deletionsdrivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
- drivers/net/ethernet/broadcom/tg3.c 14 additions, 13 deletionsdrivers/net/ethernet/broadcom/tg3.c
- drivers/net/ethernet/ibm/ehea/ehea_ethtool.c 1 addition, 1 deletiondrivers/net/ethernet/ibm/ehea/ehea_ethtool.c
- drivers/net/ethernet/ibm/ehea/ehea_main.c 16 additions, 16 deletionsdrivers/net/ethernet/ibm/ehea/ehea_main.c
- drivers/net/ethernet/ibm/ehea/ehea_qmr.c 6 additions, 8 deletionsdrivers/net/ethernet/ibm/ehea/ehea_qmr.c
- drivers/net/ethernet/renesas/sh_eth.c 1 addition, 1 deletiondrivers/net/ethernet/renesas/sh_eth.c
- drivers/net/wireless/ath/ath9k/ar9003_mac.c 3 additions, 2 deletionsdrivers/net/wireless/ath/ath9k/ar9003_mac.c
- drivers/net/wireless/ath/ath9k/mac.c 3 additions, 2 deletionsdrivers/net/wireless/ath/ath9k/mac.c
- drivers/net/wireless/b43/main.c 4 additions, 1 deletiondrivers/net/wireless/b43/main.c
- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 1 addition, 1 deletiondrivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
- drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c 4 additions, 36 deletionsdrivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
- drivers/net/wireless/ipw2x00/ipw2200.c 2 additions, 2 deletionsdrivers/net/wireless/ipw2x00/ipw2200.c
- drivers/net/wireless/iwlwifi/iwl-scan.c 1 addition, 1 deletiondrivers/net/wireless/iwlwifi/iwl-scan.c
Loading
Please register or sign in to comment