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
..
2014-04-05 15:46:37 -07:00
2013-08-14 13:55:15 +05:30
2014-03-28 20:42:01 +01:00
2014-02-15 10:58:17 +00:00
2014-04-09 08:39:39 -07:00
2014-04-18 16:40:08 -07:00
2013-12-23 18:34:58 -08:00
2013-09-10 13:03:41 -07:00
2014-04-26 12:20:32 -04:00
2014-01-24 22:39:54 +01:00
2014-04-01 15:14:04 -07:00
2013-07-03 16:31:35 -07:00
2013-07-30 11:53:12 -04:00
2014-05-13 11:26:27 -04:00
2013-11-15 09:32:21 +09:00
2013-11-09 00:16:29 -05:00
2014-03-11 11:52:47 +01:00
2014-04-03 16:20:58 -07:00
2014-02-13 10:08:52 +05:30
2014-01-16 10:23:02 +10:30
2014-04-01 23:19:14 -04:00
2014-03-10 11:44:42 -04:00
2013-08-22 22:13:54 -07:00
2014-03-10 17:26:19 -07:00
2014-02-20 14:54:28 +01:00
2014-03-04 07:55:47 -08:00
2014-01-16 11:15:50 +01:00
2014-04-07 16:36:07 -07:00
2013-12-29 16:34:25 -05:00
2014-03-07 11:41:32 -05:00
2014-04-17 12:30:40 -07:00
2013-09-13 15:09:52 +02:00
2014-03-13 12:11:00 +10:30
2013-08-09 10:49:00 +02:00
2013-07-26 16:19:48 -07:00
2014-01-25 08:55:09 +01:00
2014-04-03 16:20:50 -07:00
2013-08-28 21:35:14 -07:00
2013-12-11 15:52:34 +01:00
2014-02-28 15:36:37 -08:00
2013-12-26 13:29:35 -05:00
2014-05-06 14:02:53 -04:00
2014-04-01 23:19:08 -04:00
2014-03-04 13:51:06 -05:00
2014-01-27 21:02:39 -08:00
2013-11-09 00:16:19 -05:00
2014-04-01 23:19:10 -04:00
2013-10-14 17:15:48 +02:00
2013-12-05 13:05:48 -08:00
2014-03-17 15:14:16 -04:00
2014-03-17 15:15:21 -04:00
2014-01-25 03:14:05 -05:00
2014-04-07 10:59:19 -07:00
2014-04-03 16:21:04 -07:00
2014-04-01 18:49:04 -07:00
2014-03-19 15:11:19 -06:00
2013-10-17 00:36:06 +02:00
2014-03-19 22:24:08 -04:00
2014-02-17 15:01:52 -08:00
2014-04-01 16:13:21 -07:00
2014-03-09 19:53:45 +01:00
2013-07-03 16:08:05 -07:00
2014-01-28 13:20:09 -08:00
2014-04-01 17:08:43 +02:00
2013-12-19 19:09:38 -05:00
2014-01-27 21:02:39 -08:00
2013-09-10 18:56:32 -04:00
2014-05-12 14:03:41 -04:00
2014-02-15 11:55:28 -08:00
2014-02-17 15:01:37 -08:00
2014-04-01 17:06:09 -07:00
2014-04-07 16:35:53 -07:00
2013-10-17 15:53:09 -04:00
2013-07-10 18:11:34 -07:00
2014-01-30 16:56:55 -08:00