David S. Miller 2a43ca0aa9 mv643xx_eth: Properly resolve merge conflict. ...

The second SET_NETDEV_DEV() in the hunk should be
removed.

Reported-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

2016-10-31 10:33:08 -04:00

..

Kconfig

net: mvneta: bm: fix dependencies again

2016-05-12 16:56:30 -04:00

Makefile

net: mvneta: bm: add support for hardware buffer management

2016-03-14 12:19:46 -04:00

mv643xx_eth.c

mv643xx_eth: Properly resolve merge conflict.

2016-10-31 10:33:08 -04:00

mvmdio.c

net: mvmdio: do not clk_disable_unprepare() NULL clock

2016-10-03 02:03:27 -04:00

mvneta_bm.c

net: mvneta: Fix lacking spinlock initialization

2016-05-25 12:35:08 -07:00

mvneta_bm.h

net: mvneta: use IS_ENABLED() instead of checking for built-in or module

2016-09-12 20:27:59 -07:00

mvneta.c

ethernet/marvell: use core min/max MTU checking

2016-10-18 11:34:19 -04:00

mvpp2.c

ethernet/marvell: use core min/max MTU checking

2016-10-18 11:34:19 -04:00

pxa168_eth.c

ethernet/marvell: use core min/max MTU checking

2016-10-18 11:34:19 -04:00

skge.c

skge: Rename LED_OFF and LED_ON in marvel skge driver to avoid conflicts with leds namespace

2016-10-18 11:56:30 -04:00

skge.h

skge: Rename LED_OFF and LED_ON in marvel skge driver to avoid conflicts with leds namespace

2016-10-18 11:56:30 -04:00

sky2.c

ethernet/marvell: use core min/max MTU checking

2016-10-18 11:34:19 -04:00

sky2.h

sky2: Receive Overflows not counted

2013-03-29 14:53:19 -04:00