David S. Miller 394efd19d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/netconsole.c net/bridge/br_private.h Three mostly trivial conflicts. The net/bridge/br_private.h conflict was a function signature (argument addition) change overlapping with the extern removals from Joe Perches. In drivers/net/netconsole.c we had one change adjusting a printk message whilst another changed "printk(KERN_INFO" into "pr_info(". Lastly, the emulex change was a new inline function addition overlapping with Joe Perches's extern removals. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-11-04 13:48:30 -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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-11-04 13:48:30 -05:00
cq.c	net/mlx4_en: Add HW timestamping (TS) support	2013-04-24 16:30:14 -04:00
en_clock.c	mlx4_en: fix a build error on 32bit arches	2013-04-30 19:00:25 -04:00
en_cq.c	net/mlx4_en: Add Low Latency Socket (LLS) support	2013-06-19 18:32:16 -07:00
en_dcb_nl.c	net/mlx4_en: Disable global flow control when PFC enabled	2013-08-21 12:19:26 -07:00
en_ethtool.c	net/mlx4_en: Check device state when setting coalescing	2013-09-12 23:42:15 -04:00
en_main.c	net/mlx4_en: Fix resource leak in error flow	2013-06-25 16:29:38 -07:00
en_netdev.c	net/mlx4: Fix typo, move similar defs to same location	2013-10-17 15:10:50 -04:00
en_port.c
en_port.h
en_resources.c	net/mlx4: Strengthen VLAN tags/priorities enforcement in VST mode	2013-05-11 16:12:44 -07:00
en_rx.c	net/mlx4_en: Fix pages never dma unmapped on rx	2013-10-08 16:09:50 -04:00
en_selftest.c	drivers:net: Remove unnecessary OOM messages after netdev_alloc_skb	2013-03-09 16:09:19 -05:00
en_tx.c	net/mlx4_en: Reduce scope of local variables in mlx4_en_xmit	2013-08-21 12:19:26 -07:00
eq.c	net/mlx4_core: Respond to operation request by firmware	2013-07-29 01:12:40 -07:00
fw.c	net/mlx4: Unused local variable in mlx4_opreq_action	2013-10-17 15:10:50 -04:00
fw.h	net/mlx4_core: Respond to operation request by firmware	2013-07-29 01:12:40 -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	mlx4_en: Remove remnants of LRO support	2012-11-19 19:13:59 -05:00
main.c	net/mlx4_core: Load higher level modules according to ports type	2013-10-17 15:10:50 -04:00
Makefile	net/mlx4_en: Add HW timestamping (TS) support	2013-04-24 16:30:14 -04:00
mcg.c	net/mlx4: Clean the code to eliminate trivial build warnings	2013-10-17 15:10:49 -04:00
mlx4_en.h	net/mlx4_en: Rename name of mlx4_en_rx_alloc members	2013-10-08 16:09:50 -04:00
mlx4.h	net/mlx4_core: Respond to operation request by firmware	2013-07-29 01:12:40 -07:00
mr.c	net/mlx4_core: Fix endianness bug in set_param_l	2013-03-07 15:52:03 -05:00
pd.c	net/mlx4_core: Fix endianness bug in set_param_l	2013-03-07 15:52:03 -05:00
port.c	net/mlx4: Add set VF default vlan ID and priority support	2013-04-26 23:29:13 -04:00
profile.c	mlx4_core: Fix integer overflow issues around MTT table	2012-08-15 21:05:26 -07:00
qp.c	net/mlx4_core: Fix endianness bug in set_param_l	2013-03-07 15:52:03 -05:00
reset.c	mlx4: Use PCI Express Capability accessors	2012-08-23 10:11:13 -06:00
resource_tracker.c	mlx4_core: Fix XRC QPs detection in the resource tracker	2013-08-13 11:21:31 -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	net/mlx4: Clean the code to eliminate trivial build warnings	2013-10-17 15:10:49 -04:00