-
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6由 David S. Miller 提交于
Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wireless/ath/ath5k/phy.c
33e2bf6a
Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wireless/ath/ath5k/phy.c