AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-05 03:16:39 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
7ff74a596b
linux_dsm_epyc7002/drivers/infiniband
History
David S. Miller 4b87f92259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	Documentation/networking/ip-sysctl.txt
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

Both conflicts were simply overlapping context.

A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-01-15 15:05:59 -05:00
..
core RDMA/cm: Change return value from find_gid_port() 2012-11-29 12:16:29 -08:00
hw Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-01-15 15:05:59 -05:00
ulp ethtool: fix drvinfo strings set in drivers 2013-01-06 21:06:31 -08:00
Kconfig RDMA/ocrdma: Add driver for Emulex OneConnect IBoE RDMA adapter 2012-05-08 11:17:47 -07:00
Makefile RDMA/ocrdma: Add driver for Emulex OneConnect IBoE RDMA adapter 2012-05-08 11:17:47 -07:00