git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

author	David S. Miller <davem@davemloft.net>
	Tue, 2 Jun 2015 05:33:25 +0000 (22:33 -0700)
committer	David S. Miller <davem@davemloft.net>
	Tue, 2 Jun 2015 05:51:30 +0000 (22:51 -0700)
commit	dda922c831d1661c11a3ae1051b7160236f6ffb0
tree	2fe588dbc4dc90addaabf303713fb2c6af0dc19b	tree \| snapshot
parent	db3397b9aa30d334be237170e048dcd96e1e951d	commit \| diff
parent	c46a024ea5eb0165114dbbc8c82c29b7bcf66e71	commit \| diff

Merge git://git./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>

40 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/net/bpf_jit_comp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/emulex/benet/be_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-7000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-nvm-parse.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/d3.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/rs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/trans.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netback/netback.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netfront.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/tcm_qla2xxx.c	diff1 \|	diff2 \|	blob \| history
drivers/target/iscsi/iscsi_target.c	diff1 \|	diff2 \|	blob \| history
drivers/target/target_core_file.c	diff1 \|	diff2 \|	blob \| history
drivers/target/target_core_pr.c	diff1 \|	diff2 \|	blob \| history
drivers/target/target_core_transport.c	diff1 \|	diff2 \|	blob \| history
drivers/target/target_core_user.c	diff1 \|	diff2 \|	blob \| history
drivers/vhost/scsi.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_multicast.c	diff1 \|	diff2 \|	blob \| history
net/bridge/netfilter/ebtables.c	diff1 \|	diff2 \|	blob \| history
net/caif/caif_socket.c	diff1 \|	diff2 \|	blob \| history
net/core/ethtool.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_minisocks.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/key.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/key.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_api.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_input.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_state.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/net/bpf_jit_comp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/emulex/benet/be_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-7000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-nvm-parse.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/d3.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/rs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/trans.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netback/netback.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netfront.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/tcm_qla2xxx.c	diff1 \|	diff2 \|	blob \| history
drivers/target/iscsi/iscsi_target.c	diff1 \|	diff2 \|	blob \| history
drivers/target/target_core_file.c	diff1 \|	diff2 \|	blob \| history
drivers/target/target_core_pr.c	diff1 \|	diff2 \|	blob \| history
drivers/target/target_core_transport.c	diff1 \|	diff2 \|	blob \| history
drivers/target/target_core_user.c	diff1 \|	diff2 \|	blob \| history
drivers/vhost/scsi.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_multicast.c	diff1 \|	diff2 \|	blob \| history
net/bridge/netfilter/ebtables.c	diff1 \|	diff2 \|	blob \| history
net/caif/caif_socket.c	diff1 \|	diff2 \|	blob \| history
net/core/ethtool.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_minisocks.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/key.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/key.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_api.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_input.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_state.c	diff1 \|	diff2 \|	blob \| history