David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-20 06:08:27 -07:00
..
Kconfig	mlxsw: spectrum: Add initial support for Spectrum ASIC	2015-10-16 07:15:23 -07:00
Makefile	mlxsw: spectrum: Add initial support for Spectrum ASIC	2015-10-16 07:15:23 -07:00
cmd.h	mlxsw: cmd: Introduce FID-offset flooding tables	2015-10-16 07:15:10 -07:00
core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
core.h	mlxsw: spectrum: Add initial support for Spectrum ASIC	2015-10-16 07:15:23 -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
pci.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
pci.h	mlxsw: spectrum: Add initial support for Spectrum ASIC	2015-10-16 07:15:23 -07:00
port.h	mlxsw: Introduce Mellanox SwitchX-2 ASIC support	2015-07-30 00:05:00 -07:00
reg.h	mlxsw: reg: Add Switch Port VLAN MAC Learning register definition	2015-10-16 07:15:22 -07:00
spectrum.c	mlxsw: spectrum: Add initial support for Spectrum ASIC	2015-10-16 07:15:23 -07:00
spectrum.h	mlxsw: spectrum: Add initial support for Spectrum ASIC	2015-10-16 07:15:23 -07:00
spectrum_buffers.c	mlxsw: spectrum: Add initial support for Spectrum ASIC	2015-10-16 07:15:23 -07:00
spectrum_switchdev.c	mlxsw: spectrum: Add initial support for Spectrum ASIC	2015-10-16 07:15:23 -07:00
switchx2.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
trap.h	mlxsw: Introduce Mellanox switch driver core	2015-07-30 00:04:59 -07:00
txheader.h	mlxsw: spectrum: Add initial support for Spectrum ASIC	2015-10-16 07:15:23 -07:00