leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9f0d34bc34
linux/drivers/net/can/usb/peak_usb
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
..
Makefile can: peak_usb: add support for PEAK new CANFD USB adapters 2015-01-28 14:47:06 +01:00
pcan_ucan.h can: peak_usb_fd: add support for ISO / non-ISO mode switching 2015-03-22 18:14:51 +01:00
pcan_usb_core.c can: peak_usb: add support for PEAK new CANFD USB adapters 2015-01-28 14:47:06 +01:00
pcan_usb_core.h can: peak_usb: add support for PEAK new CANFD USB adapters 2015-01-28 14:47:06 +01:00
pcan_usb_fd.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-04-02 16:16:53 -04:00
pcan_usb_pro.c can: peak_usb: export pcan_usb_pro functions 2015-01-28 14:47:06 +01:00
pcan_usb_pro.h can: peak_usb: export pcan_usb_pro functions 2015-01-28 14:47:06 +01:00
pcan_usb.c can: peak_usb: export ctrlmode_supported to adapter specific definition 2015-01-28 14:47:05 +01:00