mirror of
https://github.com/torvalds/linux.git
synced 2026-04-21 00:04:01 -04:00
Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wireless/ath/ath5k/phy.c
Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wireless/ath/ath5k/phy.c