proxmox-mirrors/mirror_ubuntu-kernels
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_ubuntu-kernels.git synced 2026-01-04 20:44:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
acddbd2147
mirror_ubuntu-kernels/drivers/net/ethernet/chelsio
History
David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/mellanox/mlx5/core/en.h
	drivers/net/ethernet/mellanox/mlx5/core/en_main.c
	drivers/net/usb/r8152.c

All three conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-07-06 10:35:22 -07:00
..
cxgb drivers: net: remove NETDEV_TX_LOCKED 2016-04-26 15:53:05 -04:00
cxgb3 cxgb3: fix out of bounds read 2016-05-01 20:59:43 -04:00
cxgb4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-07-06 10:35:22 -07:00
cxgb4vf cxgb4vf: Synchronize access to mailbox 2016-06-25 12:04:33 -04:00
Kconfig cxgb4: update Kconfig and Makefile 2016-03-22 00:25:06 -07:00
Makefile