linux/drivers/net/can
David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-23 16:49:34 -04:00
..
c_can net: can: c_can_platform: Remove redundant of_match_ptr 2013-10-01 12:30:25 -04:00
cc770
mscan
sja1000
softing Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next 2013-09-30 19:14:20 -04:00
usb
at91_can.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-23 16:49:34 -04:00
bfin_can.c
dev.c can: dev: fix nlmsg size calculation in can_get_size() 2013-10-07 15:55:03 -04:00
flexcan.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-23 16:49:34 -04:00
grcan.c
janz-ican3.c
Kconfig
led.c
Makefile
mcp251x.c
pch_can.c
slcan.c
ti_hecc.c
vcan.c