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