David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/mips/net/bpf_jit.c drivers/net/can/flexcan.c Both the flexcan and MIPS bpf_jit conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-09-23 12:09:27 -04:00
..
c_can_pci.c	PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use	2014-08-12 12:15:14 -06:00
c_can_platform.c	can: c_can_platform: fix parameters of c_can_hw_raminit_ti()	2014-09-18 11:14:30 +02:00
c_can.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
c_can.h	can: c_can: add hwinit support for non-TI devices	2014-05-19 09:38:23 +02:00
Kconfig	can: c_can: remove obsolete STRICT_FRAME_ORDERING Kconfig option	2014-05-19 09:03:06 +02:00
Makefile	net: can: use kbuild magic to inherit debug settings	2014-08-18 01:03:38 +02:00