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/Kconfig
Simple merge

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

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

diff --cc drivers/net/ixp2000/ixpdev.c
Simple merge

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

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

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

diff --cc drivers/net/wireless/iwlwifi/iwl3945-base.c
Simple merge

diff --cc drivers/net/wireless/libertas/cmdresp.c
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc net/ipv4/udp.c
Simple merge