David S. Miller 188d1f76d0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/e1000e/ethtool.c drivers/net/vmxnet3/vmxnet3_drv.c drivers/net/wireless/iwlwifi/dvm/tx.c net/ipv6/route.c The ipv6 route.c conflict is simple, just ignore the 'net' side change as we fixed the same problem in 'net-next' by eliminating cached neighbours from ipv6 routes. The e1000e conflict is an addition of a new statistic in the ethtool code, trivial. The vmxnet3 conflict is about one change in 'net' removing a guarding conditional, whilst in 'net-next' we had a netdev_info() conversion. The iwlwifi conflict is dealing with a WARN_ON() conversion in 'net-next' vs. a revert happening in 'net'. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-02-05 14:12:20 -05:00
..
c_can.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-02-05 14:12:20 -05:00
c_can.h	can: c_can: Add d_can raminit support	2012-11-27 09:49:31 +01:00
c_can_pci.c	drivers/net: fix up function prototypes after __dev* removals	2012-12-07 14:22:22 -05:00
c_can_platform.c	can: remove __dev* attributes	2012-12-03 11:16:11 -08: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