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
..
c_can	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
cc770	can: constify of_device_id array	2015-03-17 15:00:23 -04:00
m_can	can: m_cam: m_can_fifo_write(): remove return from void function	2015-03-22 23:50:11 +01:00
mscan	can: constify of_device_id array	2015-03-17 15:00:23 -04:00
sja1000	can: constify of_device_id array	2015-03-17 15:00:23 -04:00
softing
spi
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
at91_can.c	can: at91_can: use endian agnostic IO accessors	2015-03-22 23:50:12 +01:00
bfin_can.c	bfin_can: Merge header file from arch dependent location	2015-03-04 09:52:49 +01:00
dev.c	can: add missing initialisations in CAN related skbuffs	2015-03-09 10:22:24 +01:00
flexcan.c	can: flexcan: Deferred on Regulator return EPROBE_DEFER	2015-03-22 19:20:10 +01:00
grcan.c	can: constify of_device_id array	2015-03-17 15:00:23 -04:00
janz-ican3.c	can: janz-ican3: fix type mismatch in assignment	2015-02-04 14:06:43 +01:00
Kconfig	net: can: Enable xilinx driver for ARM64	2015-03-14 09:01:16 +01:00
led.c	can: add combined rx/tx LED trigger support	2015-03-22 23:50:11 +01:00
Makefile
pch_can.c
rcar_can.c
slcan.c
ti_hecc.c
vcan.c
xilinx_can.c	can: constify of_device_id array	2015-03-17 15:00:23 -04:00