-
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless由 John W. Linville 提交于
Conflicts: drivers/net/wireless/ath/ath9k/main.c drivers/net/wireless/iwlwifi/dvm/tx.c
9ebea382
Conflicts: drivers/net/wireless/ath/ath9k/main.c drivers/net/wireless/iwlwifi/dvm/tx.c