Al Viro 237dae8890 Merge branch 'iocb' into for-davem ... trivial conflict in net/socket.c and non-trivial one in crypto - that one had evaded aio_complete() removal. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>		2015-04-09 00:01:38 -04:00
..
amso1100	IB/core: Replace ib_umem's offset field with a full address	2014-12-15 18:13:35 -08:00
cxgb3	RDMA/cxgb3: Remove a couple unneeded conditions	2014-05-28 10:04:00 -07:00
cxgb4	InfiniBand/RDMA changes for 3.20 merge window:	2015-02-21 12:53:21 -08:00
ehca	IB/core: Replace ib_umem's offset field with a full address	2014-12-15 18:13:35 -08:00
ipath	Merge branch 'iocb' into for-davem	2015-04-09 00:01:38 -04:00
mlx4	net/mlx4: Add SET_PORT opcode modifiers enumeration	2015-04-02 16:25:03 -04:00
mlx5	net/mlx5_core: Extend struct mlx5_interface to support multiple protocols	2015-04-02 16:33:43 -04:00
mthca	IB/mad: add new ioctl to ABI to support new registration options	2014-08-10 20:36:00 -07:00
nes	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
ocrdma	RDMA/ocrdma: Fix off by one in ocrdma_query_gid()	2015-02-18 08:31:06 -08:00
qib	Merge branch 'iocb' into for-davem	2015-04-09 00:01:38 -04:00
usnic	IOMMU Updates for Linux v3.18	2014-10-15 07:23:49 +02:00
Makefile	IB: Allow build of hw/ and ulp/ subdirectories independently	2014-06-02 14:51:12 -07:00