linux

mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-21 21:02:24 +00:00

History

David S. Miller c85d6975ef Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/mellanox/mlx4/cmd.c
	net/core/fib_rules.c
	net/ipv4/fib_frontend.c

The fib_rules.c and fib_frontend.c conflicts were locking adjustments
in 'net' overlapping addition and removal of code in 'net-next'.

The mlx4 conflict was a bug fix in 'net' happening in the same
place a constant was being replaced with a more suitable macro.

Signed-off-by: David S. Miller <davem@davemloft.net>

2015-04-06 22:34:15 -04:00

dsa_priv.h

net: dsa: integrate with SWITCHDEV for HW bridging

2015-02-25 17:03:38 -05:00

dsa.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-04-06 22:34:15 -04:00

Kconfig

net: dsa: make NET_DSA manually selectable from the config

2015-03-20 21:37:58 -04:00

Makefile

net: dsa: add Broadcom tag RX/TX handler