David S. Miller 54e5c4def0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/bonding/bond_alb.c drivers/net/ethernet/altera/altera_msgdma.c drivers/net/ethernet/altera/altera_sgdma.c net/ipv6/xfrm6_output.c Several cases of overlapping changes. The xfrm6_output.c has a bug fix which overlaps the renaming of skb->local_df to skb->ignore_df. In the Altera TSE driver cases, the register access cleanups in net-next overlapped with bug fixes done in net. Similarly a bug fix to send ALB packets in the bonding driver using the right source address overlaps with cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-24 00:32:30 -04:00
..
Kconfig	can: c_can: remove obsolete STRICT_FRAME_ORDERING Kconfig option	2014-05-19 09:03:06 +02:00
Makefile	c_can_pci: generic module for C_CAN/D_CAN on PCI	2012-06-19 21:22:28 +02:00
c_can.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
c_can.h	can: c_can: add hwinit support for non-TI devices	2014-05-19 09:38:23 +02:00
c_can_pci.c	can: c_can: Add and make use of 32-bit accesses functions	2014-05-19 09:38:22 +02:00
c_can_platform.c	can: c_can: add hwinit support for non-TI devices	2014-05-19 09:38:23 +02:00