David S. Miller e1ea2f9856 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Several conflicts here. NFP driver bug fix adding nfp_netdev_is_nfp_repr() check to nfp_fl_output() needed some adjustments because the code block is in an else block now. Parallel additions to net/pkt_cls.h and net/sch_generic.h A bug fix in __tcp_retransmit_skb() conflicted with some of the rbtree changes in net-next. The tc action RCU callback fixes in 'net' had some overlap with some of the recent tcf_block reworking. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-10-30 21:09:24 +09:00
..
peak_usb	drivers/net: can: Convert timers to use timer_setup()	2017-10-27 12:09:15 +09:00
ems_usb.c	net: can: usb: ems_usb: don't print error when allocating urb fails	2016-08-13 14:53:38 -07:00
esd_usb2.c	can: esd_usb2: Fix can_dlc value for received RTR, frames	2017-10-19 13:05:54 +02:00
gs_usb.c	can: gs_usb: fix busy loop if no more TX context is available	2017-10-19 13:05:54 +02:00
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-26 22:39:08 -04:00
kvaser_usb.c	can: kvaser_usb: Ignore CMD_FLUSH_QUEUE_REPLY messages	2017-10-24 13:00:36 +02:00
Makefile	can: mcba_usb: Add support for Microchip CAN BUS Analyzer	2017-04-25 09:00:49 +02:00
mcba_usb.c	can: mcba_usb: Add support for Microchip CAN BUS Analyzer	2017-04-25 09:00:49 +02:00
usb_8dev.c	can: usb_8dev: Fix memory leak of priv->cmd_msg_buffer	2017-03-03 13:00:07 +01:00