git.maquefel.me Git - linux.git/commit

author	David S. Miller <davem@davemloft.net>
	Mon, 3 Jul 2017 10:42:10 +0000 (03:42 -0700)
committer	David S. Miller <davem@davemloft.net>
	Mon, 3 Jul 2017 10:42:10 +0000 (03:42 -0700)
commit	3a3f7d130eb5c219a1a4b183b92106028747dc85
tree	c089ee16fe465b94b473c92b834cab08ca57352d	tree \| snapshot
parent	784c372a8184bdb8ae722c94250c2d57dc327a8e	commit \| diff
parent	ea23b42739a2c3c1158344928048fff8c70d1f66	commit \| diff

Merge https://git./linux/kernel/git/davem/net

Some overlapping changes in the mlx5 driver.

A merge conflict resolution posted by Stephen Rothwell was used as a
guide.

Signed-off-by: David S. Miller <davem@davemloft.net>

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/health.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/main.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/driver.h	diff1 \|	diff2 \|	blob \| history