-
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6由 John W. Linville 提交于
Conflicts: drivers/net/wireless/iwlwifi/iwl-core.c drivers/net/wireless/iwlwifi/iwl-core.h
268bae0b
Conflicts: drivers/net/wireless/iwlwifi/iwl-core.c drivers/net/wireless/iwlwifi/iwl-core.h