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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c

diff --cc drivers/net/3c509.c
Simple merge

diff --cc drivers/net/r8169.c
Simple merge

diff --cc drivers/net/sungem.c
Simple merge

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

diff --cc net/core/dev.c
Simple merge