OpenCloudOS-Kernel/drivers/net/can
David S. Miller c99f7abf0e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	include/net/inetpeer.h
	net/ipv6/output_core.c

Changes in net were fixing bugs in code removed in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-06-03 23:32:12 -07:00
..
c_can Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-05-24 00:32:30 -04:00
cc770 can: Unify MTU settings for CAN interfaces 2014-03-17 09:20:16 +01:00
mscan can: mscan: Fix Kconfig dependencies 2014-05-19 09:38:21 +02:00
sja1000 can: peak_pci: prevent use after free at netdev removal 2014-05-21 08:17:03 +02:00
softing can: softing: remove unused sysfs attributes 2014-04-25 00:09:03 +02:00
spi can: mcp251x: fix coccinelle warnings 2014-05-19 09:38:07 +02:00
usb can: gs_usb: gs_destroy_candev(): fix use after free 2014-05-21 13:04:20 +02:00
Kconfig can: xilinx CAN controller support 2014-05-26 09:36:31 +02:00
Makefile can: xilinx CAN controller support 2014-05-26 09:36:31 +02:00
at91_can.c can: Unify MTU settings for CAN interfaces 2014-03-17 09:20:16 +01:00
bfin_can.c can: Unify MTU settings for CAN interfaces 2014-03-17 09:20:16 +01:00
dev.c can: fix return value from can_get_bittiming() 2014-04-24 22:30:39 +02:00
flexcan.c can: Unify MTU settings for CAN interfaces 2014-03-17 09:20:16 +01:00
grcan.c can: Unify MTU settings for CAN interfaces 2014-03-17 09:20:16 +01:00
janz-ican3.c can: Unify MTU settings for CAN interfaces 2014-03-17 09:20:16 +01:00
led.c can: only rename enabled led triggers when changing the netdev name 2014-05-27 15:05:41 +02:00
pch_can.c can: Unify MTU settings for CAN interfaces 2014-03-17 09:20:16 +01:00
rcar_can.c can: add Renesas R-Car CAN driver 2014-05-19 09:38:23 +02:00
slcan.c can: slcan: Fix spinlock variant 2014-04-24 22:32:41 +02:00
ti_hecc.c can: Unify MTU settings for CAN interfaces 2014-03-17 09:20:16 +01:00
vcan.c can: add destructor for self generated skbs 2014-01-30 16:25:49 -08:00
xilinx_can.c can: xilinx CAN controller support 2014-05-26 09:36:31 +02:00