David S. Miller 6b6cbc1471 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were simply overlapping changes. In the net/ipv4/route.c case the code had simply moved around a little bit and the same fix was made in both 'net' and 'net-next'. In the net/sched/sch_generic.c case a fix in 'net' happened at the same time that a new argument was added to qdisc_hash_add(). Signed-off-by: David S. Miller <davem@davemloft.net>		2017-04-15 21:16:30 -04:00
..
c_can	drivers: net: generalize napi_complete_done()	2017-01-30 15:10:42 -05:00
cc770
ifi_canfd	can: ifi: use correct register to read rx status	2017-04-04 17:48:22 +02:00
m_can	drivers: net: generalize napi_complete_done()	2017-01-30 15:10:42 -05:00
mscan
rcar	can: rcar_can: Do not print virtual addresses	2017-04-04 17:49:59 +02:00
sja1000	can: sja1000: plx_pci: Add support for Moxa CAN devices	2016-10-31 20:48:19 +01:00
softing	sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>	2017-03-02 08:42:32 +01:00
spi	can: hi311x: Add Holt HI-311x CAN driver	2017-04-04 17:35:59 +02:00
usb	can: usb_8dev: Fix memory leak of priv->cmd_msg_buffer	2017-03-03 13:00:07 +01:00
at91_can.c	drivers: net: generalize napi_complete_done()	2017-01-30 15:10:42 -05:00
bfin_can.c
dev.c	can: dev: add CAN interface API for fixed bitrates	2017-01-24 13:52:00 +01:00
flexcan.c	can: flexcan: fix typo in comment	2017-03-03 13:00:07 +01:00
grcan.c
janz-ican3.c	drivers: net: generalize napi_complete_done()	2017-01-30 15:10:42 -05:00
Kconfig
led.c
Makefile	can: rx-offload: Add support for HW fifo based irq offloading	2017-02-06 15:13:23 +01:00
pch_can.c
rx-offload.c	can: rx-offload: Add support for timestamp based irq offloading	2017-02-06 15:13:24 +01:00
slcan.c
sun4i_can.c
ti_hecc.c	can: ti_hecc: Convert TI HECC driver to DT only driver	2017-04-04 16:55:26 +02:00
vcan.c
xilinx_can.c	drivers: net: generalize napi_complete_done()	2017-01-30 15:10:42 -05:00