Skip to content
Snippets Groups Projects
user avatar
David S. Miller authored
Conflicts:
	drivers/net/phy/marvell.c

Simple overlapping changes in drivers/net/phy/marvell.c

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
55b42b5c
History
Name Last commit Last update