-
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6由 David S. Miller 提交于
Conflicts: drivers/net/wireless/iwlwifi/iwl-4965-rs.c drivers/net/wireless/rt2x00/rt61pci.c
63fe46da
Conflicts: drivers/net/wireless/iwlwifi/iwl-4965-rs.c drivers/net/wireless/rt2x00/rt61pci.c