leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
87259f1877
linux/drivers/net/ethernet/freescale/fman
History
David S. Miller 0b42f25d2f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
udplite conflict is resolved by taking what 'net-next' did
which removed the backlog receive method assignment, since
it is no longer necessary.

Two entries were added to the non-priv ethtool operations
switch statement, one in 'net' and one in 'net-next, so
simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-11-26 23:42:21 -05:00
..
fman_dtsec.c fsl/fman: fix dtsec_set_tx_pause_frames 2016-03-14 15:03:10 -04:00
fman_dtsec.h fsl/fman: Add FMan MAC support 2015-12-27 20:51:40 -05:00
fman_mac.h fsl/fman: remove leftover comment 2016-10-04 10:08:44 +03:00
fman_memac.c fsl/fman: check pcsphy pointer before use 2016-10-04 09:26:08 +03:00
fman_memac.h fsl/fman: Add FMan MAC support 2015-12-27 20:51:40 -05:00
fman_muram.c fsl/fman: split lines over 80 characters 2016-10-04 09:26:05 +03:00
fman_muram.h fsl/fman: split lines over 80 characters 2016-10-04 09:26:05 +03:00
fman_port.c fsl/fman: simplify device tree reads 2016-10-04 09:26:07 +03:00
fman_port.h fsl/fman: Add FMan Port Support 2015-12-27 20:51:40 -05:00
fman_sp.c fsl/fman: fix loadable module compilation 2016-10-04 09:26:05 +03:00
fman_sp.h fsl/fman: Add FMan SP support 2015-12-27 20:51:40 -05:00
fman_tgec.c fsl/fman: fix a leak in tgec_free() 2016-11-25 20:29:48 -05:00
fman_tgec.h fsl/fman: Add FMan MAC support 2015-12-27 20:51:40 -05:00
fman.c fsl/fman: fix return value checking 2016-10-04 09:26:10 +03:00
fman.h
Kconfig fsl/fman: allow modular build 2016-01-04 21:53:42 -05:00
mac.c fsl/fman: fix error return code in mac_probe() 2016-10-17 13:16:52 -04:00
mac.h fsl/fman: return a phy_dev pointer from init 2016-10-04 09:26:07 +03:00
Makefile fsl/fman: fix loadable module compilation 2016-10-04 09:26:05 +03:00