This repository has been archived on 2022-02-17. You can view files and clone it, but cannot push or open issues or pull requests.

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
..
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
hw	A few fixes for regressions introduced in 3.4-rc1:	2012-04-26 15:35:35 -07:00
ulp	IB/srpt: Set srq_type to IB_SRQT_BASIC	2012-04-12 07:56:57 -07:00
Kconfig	ib_srpt: Initial SRP Target merge for v3.3-rc1	2011-12-16 06:33:56 +00:00
Makefile	ib_srpt: Initial SRP Target merge for v3.3-rc1	2011-12-16 06:33:56 +00:00