AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-26 00:05:35 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
03ad477615
linux_dsm_epyc7002/drivers/net/ethernet/rocker
History
David S. Miller 3a07bd6fea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/mellanox/mlx4/main.c
	net/packet/af_packet.c

Both conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-06-24 02:58:51 -07:00
..
Kconfig net: ethernet: rocker: Add dependency to CONFIG_BRIDGE in Kconfig 2014-12-09 15:26:43 -05:00
Makefile
rocker.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-06-24 02:58:51 -07:00
rocker.h rocker: make checkpatch -f clean 2015-05-12 18:43:56 -04:00