projects / linux / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 62e1309 6d04dfc)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 2 Feb 2017 21:54:00 +0000 (16:54 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 2 Feb 2017 21:54:00 +0000 (16:54 -0500)
commite2160156bf2a7d5018e99a9993fbcdda0abac09b
tree1a70cb13dcfa7ade4c48d8a64d20543abebfb1dctree | snapshot
parent62e13097c46c69dbd7544ab2cd585ccf48f360a4commit | diff
parent6d04dfc8966019b8b0977b2cb942351f13d2b178commit | diff
Merge git://git./linux/kernel/git/davem/net

All merge conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
26 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/cadence/macb.c diff1 | diff2 | blob | history
drivers/net/ethernet/cadence/macb.h diff1 | diff2 | blob | history
drivers/net/ethernet/emulex/benet/be_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/gianfar.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx4/mlx4.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_fs.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/port.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/vport.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/iwl-8000.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/sta.c diff1 | diff2 | blob | history
include/linux/netdevice.h diff1 | diff2 | blob | history
net/ipv4/tcp_output.c diff1 | diff2 | blob | history
net/sched/cls_flower.c diff1 | diff2 | blob | history
net/sched/cls_matchall.c diff1 | diff2 | blob | history
https://github.com/torvalds/linux.git