Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ibm_newemac/core.c
Simple merge

diff --cc drivers/net/netxen/netxen_nic_main.c
Simple merge

diff --cc drivers/net/qlge/qlge.h
Simple merge

diff --cc drivers/net/qlge/qlge_main.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-3945.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-5000.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-commands.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-eeprom.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-eeprom.h
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge