| commit | 9d367eddf363553c7668ba92c3b9d187ec4f71f7 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Jan 11 23:55:43 2016 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Mon Jan 11 23:55:43 2016 -0500 |
| tree | 4f06d334d316390cc9a869ce3e74ec48d32ed0f8 | |
| parent | b6a0e72ad3cffabaf30b856deb58fbe64a0f36a8 [diff] | |
| parent | 03d84a5f83a67e692af00a3d3901e7820e3e84d5 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/bonding/bond_main.c drivers/net/ethernet/mellanox/mlxsw/spectrum.h drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c The bond_main.c and mellanox switch conflicts were cases of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>