mirror of https://gitee.com/openkylin/linux.git
dda922c831
Conflicts: drivers/net/phy/amd-xgbe-phy.c drivers/net/wireless/iwlwifi/Kconfig include/net/mac80211.h iwlwifi/Kconfig and mac80211.h were both trivial overlapping changes. The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and the bug fix that happened on the 'net' side is already integrated into the rest of the amd-xgbe driver. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| caif_dev.c | ||
| caif_socket.c | ||
| caif_usb.c | ||
| cfcnfg.c | ||
| cfctrl.c | ||
| cfdbgl.c | ||
| cfdgml.c | ||
| cffrml.c | ||
| cfmuxl.c | ||
| cfpkt_skbuff.c | ||
| cfrfml.c | ||
| cfserl.c | ||
| cfsrvl.c | ||
| cfutill.c | ||
| cfveil.c | ||
| cfvidl.c | ||
| chnl_net.c | ||