David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-20 06:08:27 -07:00
..
c_can	can: c_can: Fix default pinmux glitch at init	2015-07-12 20:57:42 +02:00
cc770	can: cc770: don't touch skb after netif_rx()	2015-07-15 09:04:27 +02:00
m_can	can: m_cam: m_can_fifo_write(): remove return from void function	2015-03-22 23:50:11 +01:00
mscan	can: constify of_device_id array	2015-03-17 15:00:23 -04:00
sja1000	can: peak_pci: add unused device id. in devices table	2015-09-30 12:57:58 +02:00
softing	can: move can_stats.bus_off++ from can_bus_off into can_change_state	2015-01-20 13:56:53 +01:00
spi	can: mcp251x: get regulators optionally	2015-07-16 09:04:22 +02:00
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-08-27 21:45:31 -07:00
Kconfig	can: Allwinner A10/A20 CAN Controller support - Kernel module	2015-09-17 22:39:08 +02:00
Makefile	can: Allwinner A10/A20 CAN Controller support - Kernel module	2015-09-17 22:39:08 +02:00
at91_can.c	can: at91: remove at91_can_data	2015-10-13 17:42:35 +02:00
bfin_can.c	can: bfin_can: don't touch skb after netif_rx()	2015-07-15 09:04:27 +02:00
dev.c	can: replace timestamp as unique skb attribute	2015-07-12 21:13:22 +02:00
flexcan.c	can: flexcan: enable interrupts atomically at the end of flexcan_chip_start()	2015-09-21 08:38:23 +02:00
grcan.c	can: grcan: don't touch skb after netif_rx()	2015-07-15 09:04:27 +02:00
janz-ican3.c	can: janz-ican3: add support for CAL/CANopen firmware	2015-05-06 08:03:20 +02:00
led.c	can: add combined rx/tx LED trigger support	2015-03-22 23:50:11 +01:00
pch_can.c	can: move can_stats.bus_off++ from can_bus_off into can_change_state	2015-01-20 13:56:53 +01:00
rcar_can.c	can: rcar_can: unify error messages	2015-07-12 20:57:41 +02:00
slcan.c	can: slcan: don't touch skb after netif_rx_ni()	2015-07-15 09:04:27 +02:00
sun4i_can.c	can: sun4i: fix MODULE_DESCRIPTION	2015-10-13 17:42:34 +02:00
ti_hecc.c	can: ti_heccn: don't touch skb after netif_rx()	2015-07-15 09:04:27 +02:00
vcan.c	can: replace timestamp as unique skb attribute	2015-07-12 21:13:22 +02:00
xilinx_can.c	net: can: xilinx_can: fix extended frame handling	2015-05-01 10:11:46 +02:00