David S. Miller e0ada51db9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were simple overlapping changes in microchip driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-04-21 16:32:48 -04:00
..
stmmac	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-04-21 16:32:48 -04:00
Kconfig	stmicro: add more information to Kconfig	2017-01-18 12:12:04 -05:00
Makefile