linux/drivers/infiniband/hw/cxgb4
David S. Miller 6a06e5e1bb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/team/team.c
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/bat_iv_ogm.c
	net/ipv4/fib_frontend.c
	net/ipv4/route.c
	net/l2tp/l2tp_netlink.c

The team, fib_frontend, route, and l2tp_netlink conflicts were simply
overlapping changes.

qmi_wwan and bat_iv_ogm were of the "use HEAD" variety.

With help from Antonio Quartulli.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-09-28 14:40:49 -04:00
..
cm.c RDMA/cxgb4: Move dereference below NULL test 2012-09-07 16:19:03 -07:00
cq.c RDMA/cxgb4: Fix iw_cxgb4 count_rcqes() logic 2011-11-28 11:53:05 -08:00
device.c RDMA/cxgb4: Include vmalloc.h for vmalloc and vfree 2012-05-21 09:00:34 -07:00
ev.c RDMA/cxgb4: Disable interrupts in c4iw_ev_dispatch() 2012-05-18 13:22:32 -07:00
id_table.c RDMA/cxgb4: Remove kfifo usage 2012-05-18 13:22:36 -07:00
iw_cxgb4.h RDMA/cxgb4: Add query_qp support 2012-05-18 13:22:37 -07:00
Kconfig Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
Makefile RDMA/cxgb4: Remove kfifo usage 2012-05-18 13:22:36 -07:00
mem.c RDMA/cxgb4: Remove kfifo usage 2012-05-18 13:22:36 -07:00
provider.c RDMA/cxgb4: Add query_qp support 2012-05-18 13:22:37 -07:00
qp.c RDMA/cxgb4: Update RDMA/cxgb4 due to macro definition removal in cxgb4 driver 2012-09-05 17:41:40 -04:00
resource.c RDMA/cxgb4: Remove kfifo usage 2012-05-18 13:22:36 -07:00
t4.h RDMA/cxgb4: DB Drop Recovery for RDMA and LLD queues 2012-05-18 13:22:33 -07:00
t4fw_ri_api.h RDMA/cxgb4: Add module option to tweak delayed ack 2010-07-21 10:53:52 -07:00
user.h RDMA/cxgb4: Add DB Overflow Avoidance 2012-05-18 13:22:31 -07:00