Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge commit. Changes below are compared with the first parent: 2a893f91.
Changes
44 files changed · +353 −115
Only the first 600 diff lines are shown. Download the complete patch.
Documentation/networking/ip-sysctl.txt
View filedrivers/bcma/Kconfig
View filedrivers/bcma/driver_chipcommon_sflash.c
View filedrivers/net/ethernet/nvidia/forcedeth.c
View filedrivers/net/usb/qmi_wwan.c
View filedrivers/net/vxlan.c
View filedrivers/net/wireless/ath/ath9k/Kconfig
View filedrivers/net/wireless/ath/ath9k/ar9003_hw.c
View filedrivers/net/wireless/ath/carl9170/fw.c
View filedrivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
View filedrivers/net/wireless/brcm80211/brcmsmac/debug.h
View filedrivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c
View filedrivers/net/wireless/p54/p54usb.c
View filedrivers/net/wireless/rtlwifi/pci.c
View filedrivers/net/wireless/rtlwifi/rtl8192ce/trx.c
View filedrivers/net/wireless/rtlwifi/rtl8192de/trx.c
View filedrivers/net/wireless/rtlwifi/rtl8192se/trx.c
View filedrivers/net/wireless/rtlwifi/rtl8723ae/trx.c
View filedrivers/net/wireless/rtlwifi/usb.c
View filedrivers/net/xen-netfront.c
View filedrivers/ssb/Kconfig
View filefs/splice.c
View fileinclude/net/netns/conntrack.h
View fileThis diff is incomplete. Download the complete patch.
include/net/netns/x_tables.h
View fileThis diff is incomplete. Download the complete patch.
net/bridge/br_multicast.c
View fileThis diff is incomplete. Download the complete patch.
net/bridge/br_netlink.c
View fileThis diff is incomplete. Download the complete patch.
net/bridge/br_private.h
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/devinet.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/ipconfig.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ipt_REJECT.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/iptable_nat.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv6/netfilter/ip6t_NPT.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv6/netfilter/ip6t_REJECT.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv6/netfilter/ip6table_nat.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv6/netfilter/nf_conntrack_reasm.c
View fileThis diff is incomplete. Download the complete patch.
net/mac802154/wpan.c
View fileThis diff is incomplete. Download the complete patch.
net/netfilter/Kconfig
View fileThis diff is incomplete. Download the complete patch.
net/netfilter/nf_conntrack_core.c
View fileThis diff is incomplete. Download the complete patch.
net/netfilter/nf_conntrack_netlink.c
View fileThis diff is incomplete. Download the complete patch.
net/netfilter/nfnetlink_log.c
View fileThis diff is incomplete. Download the complete patch.
net/netfilter/xt_CT.c
View fileThis diff is incomplete. Download the complete patch.
net/netfilter/xt_hashlimit.c
View fileThis diff is incomplete. Download the complete patch.
net/netfilter/xt_recent.c
View fileThis diff is incomplete. Download the complete patch.