David S. Miller 188d1f76d0
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Conflicts:
drivers/net/ethernet/intel/e1000e/ethtool.c
drivers/net/vmxnet3/vmxnet3_drv.c
drivers/net/wireless/iwlwifi/dvm/tx.c
net/ipv6/route.c
The ipv6 route.c conflict is simple, just ignore the 'net' side change
as we fixed the same problem in 'net-next' by eliminating cached
neighbours from ipv6 routes.
The e1000e conflict is an addition of a new statistic in the ethtool
code, trivial.
The vmxnet3 conflict is about one change in 'net' removing a guarding
conditional, whilst in 'net-next' we had a netdev_info() conversion.
The iwlwifi conflict is dealing with a WARN_ON() conversion in
'net-next' vs. a revert happening in 'net'.
Signed-off-by: David S. Miller <davem@davemloft.net >
2013-02-05 14:12:20 -05:00
2012-01-05 10:51:44 -06:00
2012-12-03 16:00:01 -02:00
2012-06-25 16:44:12 -07:00
2012-11-19 14:29:46 +01:00
2012-03-07 22:52:24 -08:00
2013-01-27 00:56:10 -05:00
2013-01-18 00:28:15 +01:00
2013-01-10 00:51:54 +01:00
2012-06-17 16:29:38 -07:00
2012-12-07 14:15:04 -05:00
2010-08-20 01:42:59 -07:00
2013-01-14 15:09:36 -05:00
2013-01-29 13:59:57 -05:00
2011-04-24 10:54:56 -07:00
2012-10-21 20:37:06 -04:00
2011-01-13 21:48:25 -08:00
2012-08-09 16:18:06 -07:00
2011-11-30 18:51:03 -05:00
2012-08-14 21:49:42 -07:00
2011-08-08 14:26:29 -04:00
2013-01-28 14:43:00 -05:00
2012-08-30 03:00:16 +02:00
2012-06-01 14:18:29 -04:00
2012-10-26 05:07:00 -04:00
2012-08-10 16:52:54 -07:00
2012-04-15 12:44:40 -04:00
2011-10-06 15:49:51 -04:00
2012-04-05 05:08:04 -04:00
2010-11-08 13:50:08 -08:00
2012-04-15 12:44:40 -04:00
2010-06-03 03:21:52 -07:00
2013-01-28 00:15:27 -05:00
2012-04-15 12:44:40 -04:00
2011-12-01 11:41:06 -05:00
2013-01-09 23:59:53 -08:00
2012-07-19 10:43:03 -07:00
2012-08-22 14:21:38 -07:00
2012-06-29 01:36:36 -07:00
2011-11-29 13:17:03 -05:00
2012-10-08 17:42:36 -04:00
2011-05-12 17:46:56 -04:00
2011-03-31 11:26:23 -03:00
2012-09-10 15:30:41 -04:00
2010-08-21 23:05:39 -07:00
2013-01-27 22:46:33 -05:00
2012-04-15 12:44:40 -04:00
2012-11-27 11:56:18 +01:00
2012-05-16 15:16:56 -04:00
2011-11-14 00:19:42 -05:00
2012-05-15 20:14:35 -04:00
2012-07-16 03:44:56 -07:00
2013-01-23 13:44:01 -05:00
2012-07-19 11:02:03 -07:00
2012-12-14 13:14:07 -05:00
2012-09-27 18:12:37 -04:00
2013-01-29 13:36:24 -05:00
2013-01-23 13:44:01 -05:00
2012-11-30 15:02:56 -05:00
2012-11-30 15:02:56 -05:00
2012-07-10 22:40:14 -07:00
2013-01-08 17:56:10 -08:00
2013-01-17 18:38:19 -05:00
2013-01-18 14:41:13 -05:00
2012-08-14 14:28:32 -07:00
2012-10-04 13:58:26 -04:00
2012-10-23 09:23:40 +09:00
2013-01-21 14:17:05 -05:00
2012-11-14 18:49:50 -05:00
2013-01-30 22:41:13 -05:00
2011-04-24 10:54:56 -07:00
2011-03-31 11:26:23 -03:00
2012-05-17 18:45:20 -04:00
2011-10-31 19:32:32 -04:00
2012-04-15 12:44:40 -04:00
2012-05-15 20:14:35 -04:00
2012-09-17 13:13:24 -04:00
2013-01-16 15:19:01 +01:00
2012-06-26 21:06:11 -07:00
2010-06-03 03:21:52 -07:00
2010-04-23 13:35:55 +09:00
2013-01-21 13:33:14 -05:00
2013-01-28 23:17:51 -05:00
2012-11-20 04:19:49 -08:00
2011-05-27 13:41:33 -04:00
2013-01-14 15:04:59 -05:00
2012-09-17 18:08:54 -07:00
2012-09-10 15:30:41 -04:00
2012-11-22 07:32:47 -08:00
2011-05-17 14:16:58 -04:00
2013-01-14 15:09:36 -05:00
2012-04-15 12:44:40 -04:00
2012-11-15 17:39:51 -05:00
2010-09-08 13:42:22 -07:00
2012-05-19 01:08:16 -04:00
2012-04-16 23:53:11 -04:00
2013-01-03 13:01:30 +01:00
2012-11-03 14:45:00 -04:00
2011-03-27 17:59:04 -07:00
2012-11-03 14:59:04 -04:00
2012-11-30 12:24:40 -05:00
2013-01-14 15:09:36 -05:00
2012-09-24 15:52:33 -04:00
2011-10-21 05:22:42 -04:00
2012-08-06 13:40:47 -07:00
2013-01-28 00:15:28 -05:00
2012-04-10 10:04:07 -07:00
2013-01-06 21:09:56 -08:00
2012-06-09 14:56:12 -07:00
2013-01-31 13:53:08 -05:00
2012-04-28 22:21:51 -04:00
2012-03-12 17:05:21 -07:00
2012-04-15 12:44:40 -04:00
2012-05-16 15:17:08 -04:00
2012-04-15 12:44:40 -04:00
2010-04-22 16:12:36 -07:00
2013-01-29 22:58:40 -05:00
188d1f76d0