David S. Miller abb434cb05 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/bluetooth/l2cap_core.c Just two overlapping changes, one added an initialization of a local variable, and another change added a new local variable. Signed-off-by: David S. Miller <davem@davemloft.net>		2011-12-23 17:13:56 -05:00
..
ah.c	IB/mlx4: Add VLAN support for IBoE	2010-10-25 10:20:39 -07:00
cq.c	IB/mlx4: Don't call dma_free_coherent() with irqs disabled	2011-01-10 17:42:06 -08:00
doorbell.c	IB: expand ib_umem_get() prototype	2008-04-29 08:06:12 -07:00
Kconfig	mlx4: Fix infiniband Kconfig dependencies.	2011-08-11 23:05:05 -07:00
mad.c	mlx4_core: Add "native" argument to mlx4_cmd and its callers (where needed)	2011-12-13 13:56:05 -05:00
main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-23 17:13:56 -05:00
Makefile
mlx4_ib.h	IB/mlx4: Add support for XRC QPs	2011-10-13 09:44:18 -07:00
mr.c	IB/mlx4: Limit size of fast registration WRs	2010-10-11 14:33:17 -07:00
qp.c	Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'fdr', 'ipath', 'ipoib', 'misc', 'mlx4', 'misc', 'nes', 'qib' and 'xrc' into for-next	2011-11-01 09:37:08 -07:00
srq.c	IB/mlx4: Add support for XRC SRQs	2011-10-13 09:43:46 -07:00
user.h	mlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files	2008-07-25 10:32:52 -07:00