forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
linux-pinenote/drivers/net/ethernet/freescale/fs_enet
History
David S. Miller 3a07bd6fea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/mellanox/mlx4/main.c
	net/packet/af_packet.c

Both conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-06-24 02:58:51 -07:00
..
fec.h fs_enet: Add MPC5125 FEC support and PHY interface selection 2012-03-19 18:02:05 -04:00
fs_enet-main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-06-24 02:58:51 -07:00
fs_enet.h net: fs_enet: Implement NETIF_F_SG feature 2015-02-04 13:13:04 -08:00
Kconfig net: Move MII out from under NET_CORE and hide it 2013-06-19 22:22:56 -07:00
mac-fcc.c net: fs_enet: error: 'SCCE_ENET_TXF' undeclared 2014-10-10 00:51:24 -04:00
mac-fec.c net: fs_enet: set back promiscuity mode after restart 2014-10-22 15:33:13 -04:00
mac-scc.c net: fs_enet: set back promiscuity mode after restart 2014-10-22 15:33:13 -04:00
Makefile
mii-bitbang.c net/fsl: constify of_device_id array 2015-03-17 15:00:21 -04:00
mii-fec.c net/fsl: constify of_device_id array 2015-03-17 15:00:21 -04:00