hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
linux-sg2042/drivers/net/can
History
David S. Miller f188b951f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/renesas/ravb_main.c
	kernel/bpf/syscall.c
	net/ipv4/ipmr.c

All three conflicts were cases of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2015-12-03 21:09:12 -05:00
..
c_can can: remove obsolete assignment for CAN protocol error type 2015-11-23 09:37:38 +01:00
cc770 can: fix assignment of error location in CAN error messages 2015-11-23 09:37:34 +01:00
m_can can: remove obsolete assignment for CAN protocol error type 2015-11-23 09:37:38 +01:00
mscan can: constify of_device_id array 2015-03-17 15:00:23 -04:00
sja1000 can: remove obsolete assignment for CAN protocol error type 2015-11-23 09:37:38 +01:00
softing can: move can_stats.bus_off++ from can_bus_off into can_change_state 2015-01-20 13:56:53 +01:00
spi spi: Drop owner assignment from spi_drivers 2015-10-28 10:30:17 +09:00
usb can: remove obsolete assignment for CAN protocol error type 2015-11-23 09:37:38 +01:00
Kconfig can: Allwinner A10/A20 CAN Controller support - Kernel module 2015-09-17 22:39:08 +02:00
Makefile can: Allwinner A10/A20 CAN Controller support - Kernel module 2015-09-17 22:39:08 +02:00
at91_can.c can: at91: remove at91_can_data 2015-10-13 17:42:35 +02:00
bfin_can.c can: remove obsolete assignment for CAN protocol error type 2015-11-23 09:37:38 +01:00
dev.c can: Use correct type in sizeof() in nla_put() 2015-10-30 14:33:26 +01:00
flexcan.c can: fix assignment of error location in CAN error messages 2015-11-23 09:37:34 +01:00
grcan.c can: grcan: don't touch skb after netif_rx() 2015-07-15 09:04:27 +02:00
janz-ican3.c can: remove obsolete assignment for CAN protocol error type 2015-11-23 09:37:38 +01:00
led.c can: add combined rx/tx LED trigger support 2015-03-22 23:50:11 +01:00
pch_can.c can: fix assignment of error location in CAN error messages 2015-11-23 09:37:34 +01:00
rcar_can.c can: remove obsolete assignment for CAN protocol error type 2015-11-23 09:37:38 +01:00
slcan.c can: slcan: don't touch skb after netif_rx_ni() 2015-07-15 09:04:27 +02:00
sun4i_can.c can: remove obsolete assignment for CAN protocol error type 2015-11-23 09:37:38 +01:00
ti_hecc.c can: remove obsolete assignment for CAN protocol error type 2015-11-23 09:37:38 +01:00
vcan.c can: replace timestamp as unique skb attribute 2015-07-12 21:13:22 +02:00
xilinx_can.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-12-03 21:09:12 -05:00