David S. Miller 6b0a7f84ea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflict resolution of af_smc.c from Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-04-17 11:26:25 -07:00
..
mlxsw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-04-17 11:26:25 -07:00