1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
linux/drivers/net/ethernet/qlogic
Jakub Kicinski 833d22f2f9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in CAN on file rename.

Conflicts:
	drivers/net/can/m_can/tcan4x5x-core.c

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2021-01-08 13:28:00 -08:00
..
netxen drivers/net/ethernet: clean up mis-targeted comments 2020-09-25 16:29:00 -07:00
qed qed: fix ILT configuration of SRC block 2020-11-17 16:35:32 -08:00
qede net: remove ndo_udp_tunnel_* callbacks 2021-01-07 12:53:29 -08:00
qlcnic net: remove ndo_udp_tunnel_* callbacks 2021-01-07 12:53:29 -08:00
Kconfig qed: select CONFIG_CRC32 2021-01-05 15:50:36 -08:00
Makefile qlge: Move drivers/net/ethernet/qlogic/qlge/ to drivers/staging/qlge/ 2019-07-23 11:29:40 -07:00
qla3xxx.c net/qla3xxx: Convert to SPDX license identifiers 2020-09-16 14:32:31 +02:00
qla3xxx.h net/qla3xxx: Convert to SPDX license identifiers 2020-09-16 14:32:31 +02:00