Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2026-11-13 07:31:07 +00:00 · 2012-05-09 21:12:37 -07:00 · 2012-05-09 21:12:37 -07:00 · 958a758681
commit 958a758681
parent eeb0d0132d 8feedbb4a7
52 changed files with 735 additions and 193 deletions
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
--- a/include/linux/netfilter/xt_HMARK.h
+++ b/include/linux/netfilter/xt_HMARK.h
--- a/include/linux/netfilter/xt_hashlimit.h
+++ b/include/linux/netfilter/xt_hashlimit.h
--- a/include/linux/netfilter_ipv6/ip6_tables.h
+++ b/include/linux/netfilter_ipv6/ip6_tables.h
--- a/net/802/stp.c
+++ b/net/802/stp.c
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
--- a/net/bridge/br_stp_bpdu.c
+++ b/net/bridge/br_stp_bpdu.c
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
--- a/net/bridge/netfilter/ebt_stp.c
+++ b/net/bridge/netfilter/ebt_stp.c
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
--- a/net/ipv6/netfilter/ip6t_ah.c
+++ b/net/ipv6/netfilter/ip6t_ah.c
--- a/net/ipv6/netfilter/ip6t_frag.c
+++ b/net/ipv6/netfilter/ip6t_frag.c
--- a/net/ipv6/netfilter/ip6t_hbh.c
+++ b/net/ipv6/netfilter/ip6t_hbh.c
--- a/net/ipv6/netfilter/ip6t_rt.c
+++ b/net/ipv6/netfilter/ip6t_rt.c
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
--- a/net/netfilter/ipset/ip_set_bitmap_ipmac.c
+++ b/net/netfilter/ipset/ip_set_bitmap_ipmac.c
--- a/net/netfilter/xt_HMARK.c
+++ b/net/netfilter/xt_HMARK.c
--- a/net/netfilter/xt_TPROXY.c
+++ b/net/netfilter/xt_TPROXY.c
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
--- a/net/netfilter/xt_limit.c
+++ b/net/netfilter/xt_limit.c
--- a/net/netfilter/xt_mac.c
+++ b/net/netfilter/xt_mac.c
--- a/net/netfilter/xt_socket.c
+++ b/net/netfilter/xt_socket.c
--- a/net/wireless/ibss.c
+++ b/net/wireless/ibss.c
--- a/net/wireless/mlme.c
+++ b/net/wireless/mlme.c
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
--- a/net/wireless/wext-sme.c
+++ b/net/wireless/wext-sme.c
--- a/net/wireless/wext-spy.c
+++ b/net/wireless/wext-spy.c