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