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
..
peak_usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
Kconfig	can: peak_usb: add support for PEAK new CANFD USB adapters	2015-01-28 14:47:06 +01:00
Makefile	net: can: use kbuild magic to inherit debug settings	2014-08-18 01:03:38 +02:00
ems_usb.c	can: ems_usb: mark timestamp as little endian	2015-04-01 11:08:56 +02:00
esd_usb2.c	can: esd_usb2: Fix sparse warnings	2015-03-22 23:50:12 +01:00
gs_usb.c	can: gs_usb: check for kzalloc allocation failure	2015-03-22 18:14:50 +01:00
kvaser_usb.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
usb_8dev.c	can: move can_stats.bus_off++ from can_bus_off into can_change_state	2015-01-20 13:56:53 +01:00