linux/drivers/net/can
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 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-02-05 14:12:20 -05:00
cc770 can: Kconfig: convert 'depends on CAN_DEV' into 'if CAN_DEV...endif' block 2013-01-26 16:58:58 +01:00
mscan can: Kconfig: convert 'depends on CAN_DEV' into 'if CAN_DEV...endif' block 2013-01-26 16:58:58 +01:00
sja1000 can: Remove unnecessary alloc/OOM messages 2013-02-04 13:22:33 -05:00
softing can: Kconfig: convert 'depends on CAN_DEV' into 'if CAN_DEV...endif' block 2013-01-26 16:58:58 +01:00
usb can: Remove unnecessary alloc/OOM messages 2013-02-04 13:22:33 -05:00
at91_can.c can: at91_can: add LED trigger support 2013-01-26 16:59:00 +01:00
bfin_can.c can: remove __dev* attributes 2012-12-03 11:16:11 -08:00
dev.c can: rework skb reserved data handling 2013-01-28 18:17:25 -05:00
flexcan.c can: flexcan: add LED trigger support 2013-01-26 16:58:59 +01:00
grcan.c can: remove __dev* attributes 2012-12-03 11:16:11 -08:00
janz-ican3.c can: remove __dev* attributes 2012-12-03 11:16:11 -08:00
Kconfig can: add tx/rx LED trigger support 2013-01-26 16:58:59 +01:00
led.c can: rename LED trigger name on netdev renames 2013-01-26 16:58:59 +01:00
Makefile can: add tx/rx LED trigger support 2013-01-26 16:58:59 +01:00
mcp251x.c can: mcp251x: add LED trigger support 2013-01-26 16:59:00 +01:00
pch_can.c can: pch_can: fix invalid error codes 2013-01-26 17:13:41 +01:00
slcan.c can: rework skb reserved data handling 2013-01-28 18:17:25 -05:00
ti_hecc.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-01-29 15:32:13 -05:00
vcan.c sections: fix section conflicts in drivers/net 2012-10-06 03:04:42 +09:00