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
..
altera_msgdma.c	Altera TSE: Fix sparse errors and warnings	2014-05-15 16:46:46 -04:00
altera_msgdma.h	Altera TSE: Work around unaligned DMA receive packet issue with Altera SGDMA	2014-04-26 12:26:26 -04:00
altera_msgdmahw.h	Altera TSE: Fix sparse errors and warnings	2014-05-15 16:46:46 -04:00
altera_sgdma.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
altera_sgdma.h	Altera TSE: Work around unaligned DMA receive packet issue with Altera SGDMA	2014-04-26 12:26:26 -04:00
altera_sgdmahw.h	Altera TSE: Fix sparse errors and warnings	2014-05-15 16:46:46 -04:00
altera_tse_ethtool.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
altera_tse_main.c	Altera TSE: Disable Multicast filtering to workaround problem	2014-05-15 16:46:46 -04:00
altera_tse.h	Altera TSE: Fix sparse errors and warnings	2014-05-15 16:46:46 -04:00
altera_utils.c	Altera TSE: Fix sparse errors and warnings	2014-05-15 16:46:46 -04:00
altera_utils.h	Altera TSE: Fix sparse errors and warnings	2014-05-15 16:46:46 -04:00
Kconfig	Altera TSE: ALTERA_TSE should depend on HAS_DMA	2014-05-05 13:16:22 -04:00
Makefile	Altera TSE: Fix sparse errors and warnings	2014-05-15 16:46:46 -04:00