David S. Miller 394efd19d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/netconsole.c net/bridge/br_private.h Three mostly trivial conflicts. The net/bridge/br_private.h conflict was a function signature (argument addition) change overlapping with the extern removals from Joe Perches. In drivers/net/netconsole.c we had one change adjusting a printk message whilst another changed "printk(KERN_INFO" into "pr_info(". Lastly, the emulex change was a new inline function addition overlapping with Joe Perches's extern removals. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-11-04 13:48:30 -05:00
..
c_can_pci.c	can: c_can: remove unnecessary pci_set_drvdata()	2013-09-21 15:43:15 +02:00
c_can_platform.c	net: can: c_can_platform: Remove redundant of_match_ptr	2013-10-01 12:30:25 -04:00
c_can.c	can: c_can: Fix RX message handling, handle lost message before EOB	2013-10-31 20:18:47 +01:00
c_can.h	can: c_can: Add d_can raminit support	2012-11-27 09:49:31 +01:00
Kconfig	can: Kconfig: convert 'depends on CAN_DEV' into 'if CAN_DEV...endif' block	2013-01-26 16:58:58 +01:00
Makefile	c_can_pci: generic module for C_CAN/D_CAN on PCI	2012-06-19 21:22:28 +02:00