David S. Miller 810813c47a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Several cases of overlapping changes, as well as one instance (vxlan) of a bug fix in 'net' overlapping with code movement in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-03-08 12:34:12 -05:00
..
peak_usb	can: pcan_usb: don't provide CAN FD bittimings by non-FD adapters	2015-08-25 08:50:00 +02:00
ems_usb.c	can: ems_usb: fix coding style	2016-02-26 08:43:18 +01:00
esd_usb2.c	can: remove obsolete assignment for CAN protocol error type	2015-11-23 09:37:38 +01:00
gs_usb.c	can: gs_usb: fixed disconnect bug by removing erroneous use of kfree()	2016-02-26 08:36:33 +01:00
Kconfig	can: peak_usb: add support for PEAK new CANFD USB adapters	2015-01-28 14:47:06 +01:00
kvaser_usb.c	can: fix assignment of error location in CAN error messages	2015-11-23 09:37:34 +01:00
Makefile	net: can: use kbuild magic to inherit debug settings	2014-08-18 01:03:38 +02:00
usb_8dev.c	can: remove obsolete assignment for CAN protocol error type	2015-11-23 09:37:38 +01:00