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-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-03-29 18:02:10 -07:00
2012-03-06 21:34:45 -06: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-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-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-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-30 17:31:56 -07:00
2012-03-29 21:30:28 -07:00
2012-03-28 18:30:01 +01:00