mirror of
https://github.com/torvalds/linux
synced 2024-10-27 21:59:21 +00:00
0d6c4a2e46
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> |
||
---|---|---|
.. | ||
phy | ||
aiutils.c | ||
aiutils.h | ||
ampdu.c | ||
ampdu.h | ||
antsel.c | ||
antsel.h | ||
brcms_trace_events.c | ||
brcms_trace_events.h | ||
channel.c | ||
channel.h | ||
d11.h | ||
dma.c | ||
dma.h | ||
mac80211_if.c | ||
mac80211_if.h | ||
main.c | ||
main.h | ||
Makefile | ||
nicpci.c | ||
nicpci.h | ||
otp.c | ||
otp.h | ||
phy_shim.c | ||
phy_shim.h | ||
pmu.c | ||
pmu.h | ||
pub.h | ||
rate.c | ||
rate.h | ||
scb.h | ||
srom.c | ||
srom.h | ||
stf.c | ||
stf.h | ||
types.h | ||
ucode_loader.c | ||
ucode_loader.h |