OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/drivers/net/can
History
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 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-09-23 12:09:27 -04:00
cc770 net: can: use kbuild magic to inherit debug settings 2014-08-18 01:03:38 +02:00
m_can can: m_can: add Bosch M_CAN controller support 2014-08-18 01:03:41 +02:00
mscan net: can: use kbuild magic to inherit debug settings 2014-08-18 01:03:38 +02:00
sja1000 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-09-23 12:09:27 -04:00
softing net: can: use kbuild magic to inherit debug settings 2014-08-18 01:03:38 +02:00
spi can: mcp251x: Use dmam_alloc_coherent 2014-08-18 01:03:43 +02:00
usb net: can: use kbuild magic to inherit debug settings 2014-08-18 01:03:38 +02:00
Kconfig can: m_can: add Bosch M_CAN controller support 2014-08-18 01:03:41 +02:00
Makefile can: m_can: add Bosch M_CAN controller support 2014-08-18 01:03:41 +02:00
at91_can.c can: at91_can: add missing prepare and unprepare of the clock 2014-09-18 11:15:37 +02:00
bfin_can.c
…
dev.c can: dev: remove unused variable from can_calc_bittiming() function 2014-08-18 01:03:42 +02:00
flexcan.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-09-23 12:09:27 -04:00
grcan.c
…
janz-ican3.c
…
led.c
…
pch_can.c PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
rcar_can.c can: rcar_can: add device tree support 2014-08-18 01:03:42 +02:00
slcan.c
…
ti_hecc.c
…
vcan.c
…
xilinx_can.c
…