]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitac7ec834da043e7109c9ad1b6edb6cb05470d5b2
tree74f3a3c10a7177a5f86398b83ad7bf0569fe8b89
parentc3bc83a5ab6d07236c8fe3822dd4619a9af12b82
parent104987182bfb2056d10730904c114ed69fa41079
Merge branch 'master' of master.kernel.org:/pub/scm/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