Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 26 Feb 2010 07:22:42 +0000 (23:22 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 26 Feb 2010 07:22:42 +0000 (23:22 -0800)
commit04488734806948624dabc4514f96f14cd75b9a50
tree74f3a3c10a7177a5f86398b83ad7bf0569fe8b89
parent54831a83bfe656c4c54e287c734c6b0ccaa3719b
parentc4d49794ff2838038fd9756eae39c39a5a685833
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
13 files changed:
Documentation/networking/ip-sysctl.txt
MAINTAINERS
drivers/net/e1000/e1000_main.c
drivers/net/sfc/mcdi.c
drivers/net/tc35815.c
drivers/net/usb/cdc_ether.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/iwlwifi/iwl-tx.c
net/ipv4/devinet.c
net/ipv6/addrconf.c