renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-23 04:54:01 +08:00
Code
a154e6f6ef
linux-next/drivers/net/can/usb
History
David S. Miller 95f873f2ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	arch/arm/boot/dts/imx6sx-sdb.dts
	net/sched/cls_bpf.c

Two simple sets of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 16:59:56 -08:00
..
peak_usb can: move can_stats.bus_off++ from can_bus_off into can_change_state 2015-01-20 13:56:53 +01:00
ems_usb.c can: move can_stats.bus_off++ from can_bus_off into can_change_state 2015-01-20 13:56:53 +01:00
esd_usb2.c can: move can_stats.bus_off++ from can_bus_off into can_change_state 2015-01-20 13:56:53 +01:00
gs_usb.c can: gs_usb: add .ndo_change_mtu function 2014-11-18 21:34:59 +01:00
Kconfig can: gs_usb: Added support for the GS_USB CAN devices 2014-05-19 09:38:25 +02:00
kvaser_usb.c can: kvaser_usb: Fix state handling upon BUS_ERROR events 2015-01-27 08:55:09 +01:00
Makefile net: can: use kbuild magic to inherit debug settings 2014-08-18 01:03:38 +02:00
usb_8dev.c can: move can_stats.bus_off++ from can_bus_off into can_change_state 2015-01-20 13:56:53 +01:00