David S. Miller 22f10923dd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/amd/xgbe/xgbe-desc.c drivers/net/ethernet/renesas/sh_eth.c Overlapping changes in both conflict cases. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-12-10 15:48:20 -05:00
..
c_can
cc770	can: fix spelling errors	2014-12-07 21:22:05 +01:00
m_can	can: m_can: update to support CAN FD features	2014-11-18 21:35:06 +01:00
mscan	can: mscan: Consolidate and unify state change handling	2014-12-07 21:22:10 +01:00
sja1000	can: sja1000: Consolidate and unify state change handling	2014-12-07 21:22:09 +01:00
softing
spi
usb	can: peak_usb: fix multi-byte values endianess	2014-12-07 21:04:03 +01:00
at91_can.c
bfin_can.c
dev.c	can: dev: Consolidate and unify state change handling	2014-12-07 21:22:09 +01:00
flexcan.c	can: flexcan: Consolidate and unify state change handling	2014-12-07 21:22:10 +01:00
grcan.c
janz-ican3.c
Kconfig
led.c
Makefile	can: Enable -D__CHECK_ENDIAN__ for sparse by default	2014-12-07 21:22:06 +01:00
pch_can.c
rcar_can.c
slcan.c	can: slcan/vcan: eliminate banner[] variable, switch to pr_info()	2014-12-07 21:22:05 +01:00
ti_hecc.c
vcan.c	can: slcan/vcan: eliminate banner[] variable, switch to pr_info()	2014-12-07 21:22:05 +01:00
xilinx_can.c