mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-09 05:00:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
linux/drivers/net/ethernet/freescale
History
David S. Miller 9f0d34bc34 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/asix_common.c
	drivers/net/usb/sr9800.c
	drivers/net/usb/usbnet.c
	include/linux/usb/usbnet.h
	net/ipv4/tcp_ipv4.c
	net/ipv6/tcp_ipv6.c

The TCP conflicts were overlapping changes.  In 'net' we added a
READ_ONCE() to the socket cached RX route read, whilst in 'net-next'
Eric Dumazet touched the surrounding code dealing with how mini
sockets are handled.

With USB, it's a case of the same bug fix first going into net-next
and then I cherry picked it back into net.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-04-02 16:16:53 -04:00
..
fs_enet net/fsl: constify of_device_id array 2015-03-17 15:00:21 -04:00
fec.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-01-15 00:53:17 -05:00
fec_main.c net: fec: setup right value for mdio hold time 2015-03-29 13:40:36 -07:00
fec_mpc52xx.c net/fsl: constify of_device_id array 2015-03-17 15:00:21 -04:00
fec_mpc52xx.h
fec_mpc52xx_phy.c net/fsl: constify of_device_id array 2015-03-17 15:00:21 -04:00
fec_ptp.c ptp: fec: use helpers for converting ns to timespec. 2015-03-31 17:19:19 -04:00
fsl_pq_mdio.c net/fsl: constify of_device_id array 2015-03-17 15:00:21 -04:00
gianfar.c net/fsl: constify of_device_id array 2015-03-17 15:00:21 -04:00
gianfar.h gianfar: Make FCB access endian safe 2015-03-15 19:56:47 -04:00
gianfar_ethtool.c gianfar: correct the bad expression while writing bit-pattern 2015-02-04 13:55:24 -08:00
gianfar_ptp.c ptp: gianfar: use helpers for converting ns to timespec. 2015-03-31 17:19:18 -04:00
Kconfig net/fsl: remove dependency FSL_SOC from MDIO 2015-03-11 16:37:50 -04:00
Makefile
ucc_geth.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-04-02 16:16:53 -04:00
ucc_geth.h
ucc_geth_ethtool.c net: get rid of SET_ETHTOOL_OPS 2014-05-13 17:43:20 -04:00
xgmac_mdio.c net/fsl: constify of_device_id array 2015-03-17 15:00:21 -04:00