David S. Miller 1459143386 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ieee802154/fakehard.c A bug fix went into 'net' for ieee802154/fakehard.c, which is removed in 'net-next'. Add build fix into the merge from Stephen Rothwell in openvswitch, the logging macros take a new initial 'log' argument, a new call was added in 'net' so when we merge that in here we have to explicitly add the new 'log' arg to it else the build fails. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-11-21 22:28:24 -05:00
..
c_can	net: can: c_can: Add support for TI am4372 DCAN	2014-11-17 15:32:10 +01:00
cc770	net: can: use kbuild magic to inherit debug settings	2014-08-18 01:03:38 +02:00
m_can	can: m_can: update to support CAN FD features	2014-11-18 21:35:06 +01:00
mscan	net: can: use kbuild magic to inherit debug settings	2014-08-18 01:03:38 +02:00
sja1000	can: remove unused variable	2014-11-18 16:52:18 +01:00
softing	net: can: use kbuild magic to inherit debug settings	2014-08-18 01:03:38 +02:00
spi	can: mcp251x: Use dmam_alloc_coherent	2014-08-18 01:03:43 +02:00
usb	can: gs_usb: add .ndo_change_mtu function	2014-11-18 21:34:59 +01:00
at91_can.c	can: at91_can: add missing prepare and unprepare of the clock	2014-09-18 11:15:37 +02:00
bfin_can.c	can: Unify MTU settings for CAN interfaces	2014-03-17 09:20:16 +01:00
dev.c	can: dev: fix typo CIA -> CiA, CAN in Automation	2014-11-18 13:23:30 +01:00
flexcan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-09-23 12:09:27 -04: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
Kconfig	drivers/net/can/Kconfig: Let CAN_AT91 depend on HAS_IOMEM	2014-10-03 15:52:03 -07:00
led.c	can: only rename enabled led triggers when changing the netdev name	2014-05-27 15:05:41 +02:00
Makefile	can: m_can: add Bosch M_CAN controller support	2014-08-18 01:03:41 +02:00
pch_can.c	PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use	2014-08-12 12:15:14 -06:00
rcar_can.c	can: rcar_can: add .ndo_change_mtu function	2014-11-18 17:52:08 +01:00
slcan.c	net: set name_assign_type in alloc_netdev()	2014-07-15 16:12:48 -07: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: add .ndo_change_mtu function	2014-11-18 17:52:08 +01:00