David S. Miller e2160156bf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... All merge conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-02-02 16:54:00 -05:00
..
stmmac	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-02-02 16:54:00 -05:00
Kconfig	stmicro: add more information to Kconfig	2017-01-18 12:12:04 -05:00
Makefile