David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... The BTF conflicts were simple overlapping changes. The virtio_net conflict was an overlap of a fix of statistics counter, happening alongisde a move over to a bonafide statistics structure rather than counting value on the stack. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-08-02 10:55:32 -07:00
..
c_can	can: c_can_pci: make c_can_pci_data const	2017-12-01 09:14:22 +01:00
cc770	can: cc770: fix spelling mistake: "comptibility" -> "compatibility"	2018-07-27 10:40:16 +02:00
ifi_canfd	can: ifi: Repair the error handling	2018-03-12 09:55:12 +01:00
m_can	can: m_can: Move accessing of message ram to after clocks are enabled	2018-07-23 14:34:45 +02:00
mscan	can: mpc5xxx_can: check of_iomap return before use	2018-07-23 14:34:45 +02:00
peak_canfd	can: peak_canfd: rearrange the way resources are released	2018-07-27 10:40:18 +02:00
rcar	scripts/spelling.txt: add regsiter -> register spelling mistake	2017-05-08 17:15:13 -07:00
sja1000	can: sja1000: Replace mdelay with usleep_range in pcan_add_channels	2018-07-27 10:40:17 +02:00
softing	drivers/net: Use octal not symbolic permissions	2018-03-26 12:07:49 -04:00
spi	can: hi311x: Work around TX complete interrupt erratum	2018-05-10 18:25:30 +02:00
usb	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
at91_can.c	drivers/net: Use octal not symbolic permissions	2018-03-26 12:07:49 -04:00
dev.c	can: dev: enable multi-queue for SocketCAN devices	2018-07-27 10:40:16 +02:00
flexcan.c	can: flexcan: Switch to SPDX identifier	2018-07-27 10:40:17 +02:00
grcan.c	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
janz-ican3.c	can: janz-ican3: fix ican3_xmit()'s return type	2018-07-27 10:40:16 +02:00
Kconfig	can: remove bfin_can driver	2018-03-26 15:57:02 +02:00
led.c	can: add combined rx/tx LED trigger support	2015-03-22 23:50:11 +01:00
Makefile	can: remove bfin_can driver	2018-03-26 15:57:02 +02:00
pch_can.c	can: fix assignment of error location in CAN error messages	2015-11-23 09:37:34 +01:00
rx-offload.c	can: rx-offload: can_rx_offload_add_timestamp: remove duplicate semicolon at return statement	2018-01-05 11:12:08 +01:00
slcan.c	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
sun4i_can.c	can: sun4i: fix sun4ican_start_xmit()'s return type	2018-07-27 10:40:16 +02:00
ti_hecc.c	can: ti_hecc: Fix napi poll return value for repoll	2017-12-01 11:20:52 +01:00
vcan.c	drivers/net: Use octal not symbolic permissions	2018-03-26 12:07:49 -04:00
vxcan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-09 10:37:00 -05:00
xilinx_can.c	can: xilinx_can: add support for Xilinx CAN FD core	2018-07-27 10:40:17 +02:00