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
..
c_can.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
c_can.h	can: c_can: Add support for START pulse in RAMINIT sequence	2014-11-17 12:19:27 +01: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: use regmap_update_bits() to modify RAMINIT register	2015-01-15 16:58:00 +01: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