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)
commit7fe13c5733790ef582769a54693fa6a5abf3c032
tree567eb4394b642ddc81ff05521329d75d1cf47b88
parent8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc
parent10c435f18b8cb78a5870c08d52955594f5ec9c31
Merge branch 'master' of /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