linux/drivers/net/ethernet/mellanox/mlxsw
David S. Miller 6abdd5f593 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All three conflicts were cases of simple overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-08-30 00:54:02 -04:00
..
cmd.h mlxsw: pci: Add resources query implementation. 2016-07-24 23:11:58 -07:00
core_hwmon.c mlxsw: core: remove an unnecessary condition 2016-01-06 15:07:47 -05:00
core.c mlxsw: pci: Add resources query implementation. 2016-07-24 23:11:58 -07:00
core.h mlxsw: spectrum: Allow different traps to have different actions 2016-08-26 13:13:36 -07:00
emad.h mlxsw: Add interface to access registers and process events 2015-07-30 00:05:00 -07:00
item.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-20 06:08:27 -07:00
Kconfig mlxsw: spectrum: Introduce support for Data Center Bridging (DCB) 2016-04-06 17:24:18 -04:00
Makefile mlxsw: Introduce simplistic KVD linear area manager 2016-07-05 09:06:30 -07:00
pci.c mlxsw: pci: Add max span resources to resources query 2016-07-24 23:11:59 -07:00
pci.h mlxsw: pci: Implement reset done check 2016-03-13 22:30:01 -04:00
port.h mlxsw: spectrum: Add missing flood to router port 2016-08-24 09:39:03 -07:00
reg.h mlxsw: spectrum: Limit number of FDB records per learning session 2016-08-24 09:41:11 -07:00
spectrum_buffers.c mlxsw: spectrum_buffers: Fix pool value handling in mlxsw_sp_sb_tc_pool_bind_set 2016-08-19 18:01:56 -07:00
spectrum_dcb.c mlxsw: spectrum: Do not override PAUSE settings 2016-08-08 12:57:27 -07:00
spectrum_kvdl.c mlxsw: Introduce simplistic KVD linear area manager 2016-07-05 09:06:30 -07:00
spectrum_router.c mlxsw: router: Enable neighbors to be created on stacked devices 2016-08-24 09:39:04 -07:00
spectrum_switchdev.c mlxsw: spectrum: Remove unnecessary check in FDB processing 2016-08-24 09:41:12 -07:00
spectrum.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-08-30 00:54:02 -04:00
spectrum.h mlxsw: spectrum: Configure learning for VLAN-aware bridge port 2016-08-24 09:41:12 -07:00
switchx2.c mlxsw: pci: Add resources query implementation. 2016-07-24 23:11:58 -07:00
trap.h mlxsw: spectrum: Trap loop-backed packets 2016-08-17 19:18:27 -04:00
txheader.h mlxsw: spectrum: Add initial support for Spectrum ASIC 2015-10-16 07:15:23 -07:00