linux/drivers/net/ethernet/mellanox/mlx5/core
David S. Miller 1e8d6421cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/bonding/bond_3ad.h
	drivers/net/bonding/bond_main.c

Two minor conflicts in bonding, both of which were overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-19 01:24:22 -05:00
..
Kconfig IB/mlx5: Remove dependency on X86 2014-02-13 20:48:02 -08:00
Makefile
alloc.c
cmd.c drivers/net: delete non-required instances of include <linux/init.h> 2014-01-16 11:53:26 -08:00
cq.c IB/mlx5: Add support for resize CQ 2014-01-22 23:23:50 -08:00
debugfs.c mlx5_core: Improve debugfs readability 2014-01-22 23:23:50 -08:00
eq.c mlx5: Use enum to indicate adapter page size 2013-11-08 14:43:01 -08:00
fw.c net/mlx5_core: Support MANAGE_PAGES and QUERY_PAGES firmware command changes 2013-08-15 15:42:57 -07:00
health.c mlx5: remove health handler plugin 2013-08-05 11:04:12 -07:00
mad.c
main.c mlx5: Use pci_enable_msix_range() instead of pci_enable_msix() 2014-02-18 15:33:32 -05:00
mcg.c
mlx5_core.h
mr.c IB/mlx5: Multithreaded create MR 2013-11-08 14:42:59 -08:00
pagealloc.c mlx5_core: Fix PowerPC support 2014-01-22 23:23:52 -08:00
pd.c
port.c mlx5_core: Fix out arg size in access_register command 2014-01-22 23:23:44 -08:00
qp.c mlx5_core: Use mlx5 core style warning 2014-01-22 23:23:47 -08:00
srq.c
uar.c mlx5: fix error return code in mlx5_alloc_uuars() 2013-07-30 19:33:45 -07:00