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