David S. Miller d4185bbf62 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c Minor conflict between the BCM_CNIC define removal in net-next and a bug fix added to net. Based upon a conflict resolution patch posted by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-11-10 18:32:51 -05:00
..
alloc.c	mlx4_core: Change bitmap allocator to work in round-robin fashion	2012-05-14 13:44:38 -07:00
catas.c	mlx4: Add support for EEH error recovery	2012-07-25 15:24:13 -07:00
cmd.c	mlx4_core: Fix crash on uninitialized priv->cmd.slave_sem	2012-09-30 20:33:46 -07:00
cq.c	mlx4_core: removed function index from vf.	2012-01-22 15:08:43 -05:00
en_cq.c	net/mlx4_en: Add accelerated RFS support	2012-07-19 08:34:37 -07:00
en_dcb_nl.c	drivers/net: fix unresolved 64bit math in mellanox/mlx4/en_dcb_nl.c	2012-04-16 02:12:11 -04:00
en_ethtool.c	net/mlx4: Move MAC_MASK to a common place	2012-07-19 08:34:37 -07:00
en_main.c	mlx4: Use port management change event instead of smp_snoop	2012-07-10 09:47:10 -07:00
en_netdev.c	mlx4: change TX coalescing defaults	2012-11-07 15:30:19 -05:00
en_port.c	mlx4: Ethernet port management modifications	2011-12-13 13:56:07 -05:00
en_port.h	net/mlx4_core: set port QoS attributes	2012-04-05 05:08:03 -04:00
en_resources.c	net/mlx4_en: Force user priority by QP attribute	2012-04-05 05:08:03 -04:00
en_rx.c	net/mlx4_en: loopbacked packets are dropped when SMAC=DMAC	2012-08-03 16:49:02 -07:00
en_selftest.c	mlx4_core: Add "native" argument to mlx4_cmd and its callers (where needed)	2011-12-13 13:56:05 -05:00
en_tx.c	net/mlx4_en: Don't use vlan tag value as an indication for vlan presence	2012-10-26 03:34:15 -04:00
eq.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-10-26 15:00:48 -07:00
fw.c	Merge branches 'cma', 'cxgb4', 'ipoib', 'mlx4', 'mlx4-sriov', 'nes', 'qib' and 'srp' into for-linus	2012-10-02 07:43:59 -07:00
fw.h	mlx4: Modify proxy/tunnel QP mechanism so that guests do no calculations	2012-09-30 20:33:43 -07:00
icm.c	mlx4_core: Fix integer overflows so 8TBs of memory registration works	2012-09-13 17:52:02 -07:00
icm.h	mlx4_core: Fix integer overflows so 8TBs of memory registration works	2012-09-13 17:52:02 -07:00
intf.c	mlx4: Use port management change event instead of smp_snoop	2012-07-10 09:47:10 -07:00
Kconfig	net/mlx4_en: DCB QoS support	2012-04-05 05:08:04 -04:00
main.c	mlx4_core: Perform correct resource cleanup if mlx4_QUERY_ADAPTER() fails	2012-10-23 09:03:37 -07:00
Makefile	net/mlx4_en: DCB QoS support	2012-04-05 05:08:04 -04:00
mcg.c	net/mlx4_core: Looking for promiscuous entries on the correct port	2012-09-07 12:55:59 -04:00
mlx4.h	mlx4_core: Clean up enabling of SENSE_PORT for older (ConnectX-1/-2) HCAs	2012-10-01 02:10:44 -07:00
mlx4_en.h	mlx4: change TX coalescing defaults	2012-11-07 15:30:19 -05:00
mr.c	mlx4_core: Clean up buddy bitmap allocation	2012-08-15 21:05:27 -07:00
pd.c	net/mlx4_core: Add XRC domains and counters to resource tracker	2012-05-16 00:56:59 -04:00
port.c	net/mlx4_core: Adjustments to SET_PORT for IB SR-IOV	2012-09-30 20:33:40 -07:00
profile.c	mlx4_core: Fix integer overflow issues around MTT table	2012-08-15 21:05:26 -07:00
qp.c	mlx4: Modify proxy/tunnel QP mechanism so that guests do no calculations	2012-09-30 20:33:43 -07:00
reset.c	mlx4: Use PCI Express Capability accessors	2012-08-23 10:11:13 -06:00
resource_tracker.c	mlx4_core: Remove annoying debug messages from SR-IOV flow	2012-10-23 09:03:30 -07:00
sense.c	Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2012-10-02 09:54:49 -07:00
srq.c	mlx4_core: removed function index from vf.	2012-01-22 15:08:43 -05:00