David S. Miller 3a07bd6fea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mellanox/mlx4/main.c net/packet/af_packet.c Both conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-06-24 02:58:51 -07:00
..
c_can	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
cc770	can: constify of_device_id array	2015-03-17 15:00:23 -04: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: constify of_device_id array	2015-03-17 15:00:23 -04: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: use correct register address for acceptance filters	2015-06-09 09:39:17 +02:00
usb	net:treewide: Fix typo in drivers/net	2015-04-27 13:40:53 -04:00
at91_can.c	can: at91_can: use endian agnostic IO accessors	2015-03-22 23:50:12 +01:00
bfin_can.c	bfin_can: Merge header file from arch dependent location	2015-03-04 09:52:49 +01:00
dev.c	can: fix loss of CAN frames in raw_rcv	2015-06-21 18:58:58 +02:00
flexcan.c	can: flexcan: replace open coded "mailbox code" by proper define	2015-05-06 22:57:27 +02:00
grcan.c	can: constify of_device_id array	2015-03-17 15:00:23 -04:00
janz-ican3.c	can: janz-ican3: add support for CAL/CANopen firmware	2015-05-06 08:03:20 +02:00
Kconfig	can: CAN_GRCAN should depend on HAS_DMA	2015-04-23 14:09:58 -04:00
led.c	can: add combined rx/tx LED trigger support	2015-03-22 23:50:11 +01:00
Makefile	can: Enable -D__CHECK_ENDIAN__ for sparse by default	2014-12-07 21:22:06 +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: move can_stats.bus_off++ from can_bus_off into can_change_state	2015-01-20 13:56:53 +01:00
slcan.c	can: fix loss of CAN frames in raw_rcv	2015-06-21 18:58:58 +02:00
ti_hecc.c	can: move can_stats.bus_off++ from can_bus_off into can_change_state	2015-01-20 13:56:53 +01:00
vcan.c	can: fix loss of CAN frames in raw_rcv	2015-06-21 18:58:58 +02:00
xilinx_can.c	net: can: xilinx_can: fix extended frame handling	2015-05-01 10:11:46 +02:00