]> 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>
Mon, 12 Oct 2009 06:15:47 +0000 (23:15 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 12 Oct 2009 06:15:47 +0000 (23:15 -0700)
commit2e9636a247706f2a2b5f987488bdff19fa229a97
tree567eb4394b642ddc81ff05521329d75d1cf47b88
parent01cc5bfc20ed5ea8a23c6649f5c9368e5d7a9df9
parentba5f3fc92ac1629edd1737fc0435b953e6e0fe2e
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
12 files changed:
MAINTAINERS
drivers/net/ibm_newemac/core.c
drivers/net/netxen/netxen_nic_main.c
drivers/net/qlge/qlge.h
drivers/net/qlge/qlge_main.c
drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-commands.h
drivers/net/wireless/iwlwifi/iwl-eeprom.c
drivers/net/wireless/iwlwifi/iwl-eeprom.h
include/linux/netdevice.h
net/wireless/nl80211.c