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> |
||
|---|---|---|
| .. | ||
| build | ||
| cgroup | ||
| firewire | ||
| hv | ||
| iio | ||
| include | ||
| lguest | ||
| lib | ||
| net | ||
| nfsd | ||
| perf | ||
| power | ||
| scripts | ||
| testing | ||
| thermal/tmon | ||
| time | ||
| usb | ||
| virtio | ||
| vm | ||
| Makefile | ||