David S. Miller 0c1072ae02
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Conflicts:
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/renesas/sh_eth.c
net/ipv4/gre.c
The GRE conflict is between a bug fix (kfree_skb --> kfree_skb_list)
and the splitting of the gre.c code into seperate files.
The FEC conflict was two sets of changes adding ethtool support code
in an "!CONFIG_M5272" CPP protected block.
Finally the sh_eth.c conflict was between one commit add bits set
in the .eesr_err_check mask whilst another commit removed the
.tx_error_check member and assignments.
Signed-off-by: David S. Miller <davem@davemloft.net >
2013-07-03 14:55:13 -07:00
2013-05-09 10:15:46 -07:00
2012-11-26 14:22:21 +01:00
2013-05-09 09:46:45 -07:00
2012-12-17 17:15:25 -08:00
2013-05-04 12:33:36 -07:00
2013-01-22 17:51:01 +00:00
2013-04-29 18:28:19 -07:00
2013-04-09 14:57:06 +02:00
2013-02-27 19:10:22 -08:00
2012-11-09 18:07:11 +05:30
2013-05-07 18:38:26 -07:00
2012-06-26 21:19:02 -07:00
2013-05-05 13:23:27 -07:00
2013-04-23 13:45:22 +02:00
2012-10-08 13:50:12 +10:30
2013-04-24 11:42:43 +10:00
2013-07-03 14:55:13 -07:00
2013-07-03 14:55:13 -07:00
2013-01-22 09:41:43 -08:00
2013-01-01 11:18:26 -02:00
2013-04-12 14:06:16 +10:00
2012-11-19 14:28:24 +01:00
2013-06-06 10:51:34 -05:00
2012-11-14 15:07:18 -08:00
2012-12-14 08:48:59 +01:00
2013-05-04 14:49:36 +02:00
2013-03-22 11:18:34 +01:00
2013-04-02 09:39:55 -07:00
2012-09-20 16:49:17 -04:00
2013-03-11 07:49:37 -07:00
2013-03-25 13:32:20 -07:00
2013-05-07 07:59:19 -07:00
2013-04-02 09:40:03 -07:00
2013-01-21 14:52:42 -08:00
2013-04-01 11:04:53 -07:00
2013-05-17 15:17:12 +02:00
2013-03-02 20:09:50 +00:00
2013-04-08 16:57:15 -07:00
2013-03-22 12:10:42 -04:00
2013-01-26 22:20:06 -08:00
2013-07-03 14:55:13 -07:00
2013-01-10 01:27:46 +01:00
2013-01-24 17:25:13 +01:00
2013-05-14 01:58:43 +02:00
2013-06-01 08:29:23 +10:00
2012-10-02 21:14:29 +10:00
2013-05-24 16:22:50 -07:00
2013-05-02 17:54:19 +02:00
2013-05-02 15:50:20 +02:00
2012-09-13 16:52:04 +02:00
2013-04-06 11:31:30 +01:00
2013-03-19 14:16:42 -07:00
2013-01-15 21:57:44 -08:00
2013-06-17 11:15:56 +02:00
2013-01-03 15:57:16 -08:00
2013-06-25 16:35:52 -07:00
2012-09-17 17:12:58 -07:00
2013-04-27 09:16:04 +08:00
2013-04-27 16:41:43 -07:00
2013-04-30 09:36:50 -07:00
2013-03-28 14:45:56 -07:00
2013-04-18 21:20:34 -03:00
2013-05-05 14:47:31 -07:00
2013-04-29 15:54:36 -07:00
2013-02-18 13:55:24 -08:00
2013-03-01 12:48:36 +01:00
2013-04-30 08:35:20 -07:00
2013-05-09 01:07:09 -07:00
2013-04-16 18:47:22 +09:00
2013-03-03 12:06:09 -08:00
2013-01-08 14:14:55 -08:00
2013-05-15 00:42:52 -07:00
2013-04-27 23:03:43 -07:00
2013-04-08 15:42:03 +02:00
2013-01-11 11:38:03 -08:00
2012-11-14 09:39:44 -08:00
2013-05-17 15:17:12 +02:00
2013-02-27 19:10:23 -08:00
2012-10-24 17:06:43 +02:00
2012-11-29 03:30:34 -08:00
2013-05-01 16:35:36 +05:30
2013-06-08 02:13:44 +05:30
2012-11-19 14:10:53 +01:00
2013-01-17 12:19:09 -08:00
2012-07-29 21:11:05 -03:00
2012-05-17 19:06:13 -04:00
2013-04-16 18:47:19 +09:00
2012-12-10 15:54:27 +01:00
2013-03-10 18:16:36 +08:00
2012-05-25 16:18:34 +02:00
2013-01-11 11:38:03 -08:00
2013-04-29 15:18:50 +02:00
2013-02-27 19:10:21 -08:00
2012-12-05 23:52:10 +00:00
2012-11-27 21:08:57 +01:00
2013-06-12 16:42:39 -07:00
2013-04-27 16:52:47 -07:00
2012-09-04 16:06:34 -07:00
2012-11-28 18:36:06 +10:00
2013-02-19 08:42:37 +01:00
2013-01-31 19:20:33 -05:00
2012-06-28 12:03:15 +02:00
2013-04-24 11:42:42 +10:00
2013-02-08 13:27:13 -02:00
2013-01-08 14:14:55 -08:00
2012-12-12 17:38:33 -08:00
2012-09-26 19:56:15 +02:00
2013-03-18 11:03:29 +01:00
2013-07-01 23:22:13 -07:00
2012-09-10 17:05:45 +02:00
2012-09-06 22:16:58 -07:00
2012-10-09 16:22:40 +09:00
2012-09-18 12:53:22 +03:00
2013-01-03 15:57:16 -08:00
2012-10-06 03:05:01 +09:00
2012-10-01 15:27:48 +02:00
2012-12-17 17:15:23 -08:00
2012-06-25 12:11:58 -07:00
2013-04-29 18:28:20 -07:00
2013-04-30 17:04:10 -07:00
2013-04-04 10:24:53 -07:00
2012-09-21 10:48:03 -06:00
2012-07-13 22:24:45 -07:00
0c1072ae02
