David S. Miller 1e8d6421cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/bonding/bond_3ad.h drivers/net/bonding/bond_main.c Two minor conflicts in bonding, both of which were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-02-19 01:24:22 -05:00
..
c_can	can: c_can: Speed up rx_poll function	2013-12-17 11:47:19 +01:00
cc770	can: cc770: use dev_get_platdata()	2013-09-21 15:43:13 +02:00
mscan	Merge remote-tracking branch 'agust/next' into next	2014-01-29 16:53:55 +11:00
sja1000	can: sja1000: of: add reg-io-width property for 8, 16 and 32-bit register access	2014-02-06 11:50:57 +01:00
softing	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
usb	can: kvaser_usb: check number of channels returned by HW	2014-02-12 10:42:02 +01:00
at91_can.c	can: at91_can: add listen only mode	2014-02-11 09:55:44 +01:00
bfin_can.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
dev.c	linux-can-next-for-3.15-20140212	2014-02-13 18:16:00 -05:00
flexcan.c	can: flexcan: fix flexcan driver build for big endian on ARM and little endian on PowerPc	2014-01-29 20:23:22 +01:00
grcan.c	drivers: remove unnecessary prom.h includes	2013-10-09 20:03:58 -05:00
janz-ican3.c	linux-can-fixes-for-3.14-20140129	2014-01-30 16:48:17 -08:00
Kconfig	can: flexcan: fix flexcan driver build for big endian on ARM and little endian on PowerPc	2014-01-29 20:23:22 +01:00
led.c	net: pass info struct via netdevice notifier	2013-05-28 13:11:01 -07:00
Makefile	can: add tx/rx LED trigger support	2013-01-26 16:58:59 +01:00
mcp251x.c	can: mcp251x: Add device tree support	2013-12-21 15:04:24 +01:00
pch_can.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
slcan.c	can: Fix FSF address in file headers	2013-12-17 11:47:21 +01:00
ti_hecc.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
vcan.c	can: add destructor for self generated skbs	2014-01-30 16:25:49 -08:00