tree 95a2f61c72336932e83d9e4180cd9739106d624b
parent be65de7174123e02477bd488db1a657caf0f9947
parent 1ee1ceafb572f1a925809168267a7962a4289de8
author David S. Miller <davem@davemloft.net> 1400905950 -0400
committer David S. Miller <davem@davemloft.net> 1400905950 -0400

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>