David S. Miller dda922c831 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/amd-xgbe-phy.c drivers/net/wireless/iwlwifi/Kconfig include/net/mac80211.h iwlwifi/Kconfig and mac80211.h were both trivial overlapping changes. The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and the bug fix that happened on the 'net' side is already integrated into the rest of the amd-xgbe driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-06-01 22:51:30 -07:00
..
ebt_802_3.c
ebt_among.c
ebt_arp.c
ebt_arpreply.c
ebt_dnat.c
ebt_ip6.c
ebt_ip.c
ebt_limit.c
ebt_log.c
ebt_mark_m.c
ebt_mark.c
ebt_nflog.c
ebt_pkttype.c
ebt_redirect.c
ebt_snat.c
ebt_stp.c	netfilter: x_tables: add context to know if extension runs from nft_compat	2015-05-15 20:14:07 +02:00
ebt_vlan.c
ebtable_broute.c
ebtable_filter.c	netfilter: Make nf_hookfn use nf_hook_state.	2015-04-04 12:31:38 -04:00
ebtable_nat.c	netfilter: Make nf_hookfn use nf_hook_state.	2015-04-04 12:31:38 -04:00
ebtables.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-01 22:51:30 -07:00
Kconfig
Makefile
nf_log_bridge.c
nf_tables_bridge.c	netfilter: Pass nf_hook_state through nft_set_pktinfo*().	2015-04-04 12:54:27 -04:00
nft_meta_bridge.c	netfilter: nf_tables: switch registers to 32 bit addressing	2015-04-13 17:17:29 +02:00
nft_reject_bridge.c	netfilter: nf_tables: get rid of NFT_REG_VERDICT usage	2015-04-13 17:17:07 +02:00