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