David S. Miller 0d6c4a2e46
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Conflicts:
drivers/net/ethernet/intel/e1000e/param.c
drivers/net/wireless/iwlwifi/iwl-agn-rx.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
drivers/net/wireless/iwlwifi/iwl-trans.h
Resolved the iwlwifi conflict with mainline using 3-way diff posted
by John Linville and Stephen Rothwell. In 'net' we added a bug
fix to make iwlwifi report a more accurate skb->truesize but this
conflicted with RX path changes that happened meanwhile in net-next.
In e1000e a conflict arose in the validation code for settings of
adapter->itr. 'net-next' had more sophisticated logic so that
logic was used.
Signed-off-by: David S. Miller <davem@davemloft.net >
2012-05-07 23:35:40 -04:00
2012-05-07 23:35:40 -04:00
2011-06-15 21:52:50 -07:00
2012-03-30 03:30:19 -04:00
2012-03-30 16:03:15 -07:00
2012-03-07 16:08:24 +01:00
2012-03-23 16:58:33 -07:00
2011-09-27 18:08:04 +02:00
2011-11-04 12:01:48 -07:00
2012-03-30 16:03:15 -07:00
2011-09-27 18:08:04 +02:00
2012-04-12 13:12:11 -07:00
2011-11-08 10:23:29 +01:00
2012-03-30 01:52:58 -04:00
2011-12-12 14:14:31 -08:00
2012-03-28 18:43:38 +01:00
2012-05-07 23:35:40 -04:00
2012-04-23 23:15:17 -04:00
2012-03-18 21:38:28 +00:00
2012-03-19 14:55:55 -03:00
2012-03-20 10:09:28 +00:00
2011-10-26 16:32:13 -04:00
2012-03-30 16:03:15 -07:00
2012-04-09 01:39:24 -04:00
2011-09-27 18:08:04 +02:00
2011-03-22 11:43:51 +01:00
2012-04-01 10:25:56 -07:00
2012-03-30 16:03:15 -07:00
2012-03-07 16:08:24 +01:00
2011-03-31 11:26:23 -03:00
2012-03-30 16:03:15 -07:00
2012-03-30 16:03:15 -07:00
2012-04-02 09:50:40 -07:00
2012-03-30 16:03:15 -07:00
2011-07-25 23:06:24 -07:00
2012-03-30 16:03:15 -07:00
2011-12-27 11:27:13 +01:00
2012-02-15 14:48:01 -08:00
2012-03-30 16:03:15 -07:00
2012-03-23 16:58:34 -07:00
2011-08-03 14:25:21 -10:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2012-01-11 23:58:43 -05:00
2012-05-07 23:35:40 -04:00
2012-04-12 15:10:36 -04:00
2011-09-27 18:08:04 +02:00
2012-04-29 22:29:30 +02:00
2012-03-18 23:59:34 +01:00
2011-01-13 08:03:21 -08:00
2011-05-13 16:31:00 -07:00
2011-05-23 13:01:00 -07:00
2011-11-02 16:07:02 -07:00
2012-02-21 09:06:08 -08:00
2012-03-30 16:03:15 -07:00
2012-01-27 13:28:53 +01:00
2012-03-31 13:31:23 -07:00
2012-04-25 12:46:50 -04:00
2012-03-30 16:03:15 -07:00
2012-04-11 14:10:57 +02:00
2012-03-07 19:19:48 -07:00
2012-04-27 00:09:26 -04:00
2012-02-10 09:52:18 +01:00
2011-03-31 11:26:23 -03:00
2012-01-23 03:15:25 -05:00
2011-09-27 18:08:04 +02:00
2012-03-20 21:12:50 -07:00
2012-04-06 13:54:00 -07:00
2011-07-14 17:57:09 -07:00
2012-03-30 16:03:15 -07:00
2012-03-28 14:35:31 -07:00
2012-03-28 17:14:37 -07:00
2011-03-31 11:26:23 -03:00
2012-03-27 20:15:37 +02:00
2011-08-16 08:04:08 -07:00
2012-03-20 21:04:47 -07:00
2012-03-23 16:58:37 -07:00
2011-12-11 10:31:58 -08:00
2011-09-27 18:08:04 +02:00
2011-05-25 08:39:21 -07:00
2011-07-11 16:48:38 -07:00
2012-03-16 20:35:01 +00:00
2012-01-14 22:25:56 +01:00
2012-03-30 16:03:15 -07:00
2012-03-29 15:38:31 +10:30
2012-03-23 16:58:37 -07:00
2011-03-31 11:26:23 -03:00
2012-01-13 10:12:23 -08:00
2011-11-09 12:10:37 +02:00
2011-07-26 16:49:45 -07:00
2011-11-02 16:07:02 -07:00
2012-03-28 16:36:44 +02:00
2012-03-26 11:33:22 +05:30
2012-03-07 16:08:24 +01:00
2012-03-30 16:03:15 -07:00
2012-01-24 12:50:36 -08:00
2012-03-19 12:03:58 +01:00
2011-03-31 11:26:23 -03:00
2011-08-13 18:34:03 -07:00
2012-04-12 15:16:26 -07:00
2011-04-28 16:12:47 -04:00
2012-03-12 11:27:07 -06:00
2011-12-12 14:14:31 -08:00
2011-09-21 19:45:34 +03:00
2011-03-23 20:44:18 +01:00
2011-05-25 08:39:45 -07:00
2012-02-14 14:06:47 -07:00
2011-03-31 11:26:23 -03:00
2011-09-27 18:08:04 +02:00
2012-03-29 14:53:25 -07:00
2011-12-02 16:12:42 +00:00
2012-02-15 14:48:01 -08:00
2011-03-07 13:20:05 -08:00
2011-12-11 10:31:23 -08:00
2011-05-28 17:03:29 +02:00
2012-02-11 15:11:28 +01:00
2012-01-30 12:54:40 -05:00
2012-03-28 17:14:37 -07:00
2011-06-13 13:43:05 +02:00
2011-12-23 10:17:51 +11:00
2011-09-27 18:08:04 +02:00
2011-09-27 18:08:04 +02:00
2011-02-03 16:08:57 -08:00
2012-03-30 16:03:15 -07:00
2012-02-28 16:05:06 +01:00
2011-11-07 07:54:42 +10:30
2012-03-30 16:03:15 -07:00
2012-03-05 11:25:11 +01:00
2011-06-15 21:52:50 -07:00
2011-08-13 18:34:03 -07:00
2011-07-24 10:03:05 -07:00
2012-03-06 19:14:12 +02:00
2011-09-27 18:08:04 +02:00
2012-02-08 22:53:58 +02:00
2011-03-09 11:25:10 -08:00
2011-03-31 11:26:23 -03:00
2011-07-11 12:45:04 -07:00
2011-03-30 12:02:05 +02:00
2012-01-24 10:50:22 -08:00
2012-02-24 09:12:19 +01:00
2011-07-25 20:57:17 -07:00
2011-08-13 18:34:03 -07:00
2011-08-13 18:34:02 -07:00
2012-03-30 16:03:15 -07:00
2012-01-02 13:04:55 +01:00
2011-03-31 13:40:42 +02:00
2011-01-13 08:03:24 -08:00
David S. Miller
0d6c4a2e46
