David S. Miller ff24e4980a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Three trivial overlapping conflicts.

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

2019-05-02 22:14:21 -04:00

..

stmmac

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2019-05-02 22:14:21 -04:00

Kconfig

stmicro: add more information to Kconfig

2017-01-18 12:12:04 -05:00

Makefile

stmmac: Move the STMicroelectronics driver

2011-08-11 16:29:01 -07:00