linux/drivers/infiniband/hw/cxgb4
David S. Miller 8fd90bb889 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/infiniband/hw/cxgb4/device.c

The cxgb4 conflict was simply overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-07-22 00:44:59 -07:00
..
cm.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-07-22 00:44:59 -07:00
cq.c iw_cxgb4: advertise the correct device max attributes 2014-07-21 20:23:59 -07:00
device.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-07-22 00:44:59 -07:00
ev.c cxgb4/iw_cxgb4: display TPTE on errors 2014-07-15 16:25:16 -07:00
id_table.c drivers/infiniband/hw: rename random32() to prandom_u32() 2013-05-07 18:38:27 -07:00
iw_cxgb4.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-07-22 00:44:59 -07:00
Kconfig RDMA/cxgb4: Update Kconfig to include Chelsio T5 adapter 2014-04-28 17:29:41 -07:00
Makefile RDMA/cxgb4: Remove kfifo usage 2012-05-18 13:22:36 -07:00
mem.c RDMA/cxgb4: Add missing debug stats 2014-04-11 11:36:09 -07:00
provider.c iw_cxgb4: advertise the correct device max attributes 2014-07-21 20:23:59 -07:00
qp.c iw_cxgb4: advertise the correct device max attributes 2014-07-21 20:23:59 -07:00
resource.c RDMA/cxgb4: Add missing debug stats 2014-04-11 11:36:09 -07:00
t4.h iw_cxgb4: Don't limit TPTE count to 32KB 2014-07-21 20:23:59 -07:00
t4fw_ri_api.h cxgb4/iw_cxgb4: Move common defines to cxgb4 2014-07-17 16:06:03 -07:00
user.h RDMA/cxgb4: add missing padding at end of struct c4iw_alloc_ucontext_resp 2014-06-05 09:13:54 -07:00