OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/drivers/infiniband/hw
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
..
amso1100 Drivers: infinband: remove __dev* attributes. 2013-01-03 15:57:15 -08:00
cxgb3 RDMA/cxgb3: use WARN 2012-11-26 11:08:16 -08:00
cxgb4 RDMA/cxgb4: Fix bug for active and passive LE hash collision path 2012-12-19 23:03:12 -08:00
ehca Drivers: infinband: remove __dev* attributes. 2013-01-03 15:57:15 -08:00
ipath Drivers: infinband: remove __dev* attributes. 2013-01-03 15:57:15 -08:00
mlx4 IB/mlx4: Fix spinlock order to avoid lockdep warnings 2012-11-29 12:14:45 -08:00
mthca Drivers: infinband: remove __dev* attributes. 2013-01-03 15:57:15 -08:00
nes Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-01-15 15:05:59 -05:00
ocrdma RDMA/ocrdma: Fix CQE expansion of unsignaled WQE 2012-09-14 10:40:58 -07:00
qib Drivers: infinband: remove __dev* attributes. 2013-01-03 15:57:15 -08:00