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
..
2008-07-27 23:00:59 +02:00
2008-12-09 00:50:13 -08:00
2012-03-28 18:30:03 +01:00
2008-07-27 23:00:59 +02:00
2012-03-28 18:30:03 +01:00
2008-07-27 23:00:59 +02:00
2012-03-28 18:30:03 +01:00
2014-05-05 15:26:29 -04:00
2014-05-05 15:26:29 -04:00
2008-07-27 23:00:59 +02:00
2013-03-20 11:06:55 -07:00
2012-03-28 18:30:03 +01:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2010-07-24 09:57:52 -06:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-08-31 20:56:15 -07:00
2012-05-13 13:23:16 -07:00
2012-03-28 18:30:03 +01:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2013-03-20 11:06:54 -07:00
2008-07-27 23:00:59 +02:00
2012-03-28 18:30:03 +01:00
2012-03-28 18:30:03 +01:00
2008-08-29 02:15:23 -07:00
2011-05-12 13:44:29 -07:00
2008-07-27 23:00:59 +02:00
2011-04-19 22:11:40 -07:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2012-05-15 10:22:00 -07:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2012-03-28 18:30:03 +01:00
2012-05-14 14:05:07 -07:00
2008-07-27 23:00:59 +02:00
2012-07-26 16:46:16 -07:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2012-02-23 20:19:04 -07:00
2012-02-23 20:19:04 -07:00
2012-08-18 23:26:19 -07:00
2012-07-26 16:46:16 -07:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2013-03-31 19:29:12 -04:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2012-04-15 10:28:50 -07:00
2008-07-27 23:00:59 +02:00
2011-05-25 08:39:13 -07:00
2008-07-27 23:00:59 +02:00
2013-11-18 15:07:35 -08:00
2014-05-03 22:31:52 -07:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2012-07-26 16:46:16 -07:00
2008-07-27 23:00:59 +02:00