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

Conflicts:
	net/core/dev.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/e1000/e1000_main.c
Simple merge

diff --cc drivers/net/e1000e/netdev.c
Simple merge

diff --cc drivers/net/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/wireless/at76c50x-usb.c
Simple merge

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