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
..
amso1100	net: set name_assign_type in alloc_netdev()	2014-07-15 16:12:48 -07:00
cxgb3	RDMA/cxgb3: Remove a couple unneeded conditions	2014-05-28 10:04:00 -07:00
cxgb4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-07-22 00:44:59 -07:00
ehca	Merge branches 'core', 'cxgb4', 'ip-roce', 'iser', 'misc', 'mlx4', 'nes', 'ocrdma', 'qib', 'sgwrapper', 'srp' and 'usnic' into for-next	2014-04-03 08:30:17 -07:00
ipath	IB/ipath: Use time_before()/_after()	2014-05-28 09:57:06 -07:00
mlx4	Main batch of InfiniBand/RDMA changes for 3.16:	2014-06-10 10:41:33 -07:00
mlx5	IB/mlx5: Enable "block multicast loopback" for kernel consumers	2014-07-16 23:14:26 -07:00
mthca	IB/mthca: Use pci_enable_msix_exact() instead of pci_enable_msix()	2014-04-10 18:41:34 -07:00
nes	RDMA/nes: Add support for iWARP Port Mapper user space service	2014-06-10 10:12:06 -07:00
ocrdma	RDMA/ocrdma: Convert to use simple_open()	2014-05-19 17:55:54 -07:00
qib	Merge branches 'core', 'cxgb3', 'cxgb4', 'iser', 'iwpm', 'misc', 'mlx4', 'mlx5', 'noio', 'ocrdma', 'qib', 'srp' and 'usnic' into for-next	2014-06-10 10:12:14 -07:00
usnic	Merge branches 'core', 'cxgb3', 'cxgb4', 'iser', 'iwpm', 'misc', 'mlx4', 'mlx5', 'noio', 'ocrdma', 'qib', 'srp' and 'usnic' into for-next	2014-06-10 10:12:14 -07:00
Makefile	IB: Allow build of hw/ and ulp/ subdirectories independently	2014-06-02 14:51:12 -07:00