-
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6由 David S. Miller 提交于
Conflicts: drivers/net/wireless/iwlwifi/iwl-core.h drivers/net/wireless/rt2x00/rt2800pci.c
19bc291c
Conflicts: drivers/net/wireless/iwlwifi/iwl-core.h drivers/net/wireless/rt2x00/rt2800pci.c