OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/drivers/infiniband/hw/nes
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
..
Kconfig RDMA/nes: Update copyright and branding string 2009-12-09 15:21:56 -08:00
Makefile RDMA/nes: Support for Packed And Unaligned fpdus 2011-10-10 10:54:47 -07:00
nes.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-01-15 15:05:59 -05:00
nes.h RDMA/nes: Fix for terminate timer crash 2012-12-08 00:31:02 -08:00
nes_cm.c nes: remove usage of dev->master 2013-01-04 13:31:50 -08:00
nes_cm.h RDMA/nes: Copyright update 2012-01-30 16:18:07 -08:00
nes_context.h RDMA/nes: Copyright update 2012-01-30 16:18:07 -08:00
nes_hw.c RDMA/nes: Fix for terminate timer crash 2012-12-08 00:31:02 -08:00
nes_hw.h RDMA/nes: Copyright update 2012-01-30 16:18:07 -08:00
nes_mgt.c RDMA/nes: Use WARN() 2012-11-22 00:49:15 -08:00
nes_mgt.h RDMA/nes: Copyright update 2012-01-30 16:18:07 -08:00
nes_nic.c remove init of dev->perm_addr in drivers 2013-01-08 18:00:48 -08:00
nes_user.h RDMA/nes: Copyright update 2012-01-30 16:18:07 -08:00
nes_utils.c RDMA/nes: Print hardware resource type 2012-09-30 20:34:55 -07:00
nes_verbs.c RDMA/nes: Fix for crash when registering zero length MR for CQ 2012-12-08 00:31:03 -08:00
nes_verbs.h RDMA/nes: Copyright update 2012-01-30 16:18:07 -08:00