David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-06-15 11:59:32 -04:00
..
stmmac	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
Kconfig	stmicro: add more information to Kconfig	2017-01-18 12:12:04 -05:00
Makefile	…