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

Conflicts:
	drivers/net/wireless/orinoco/main.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/8139too.c
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

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

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

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

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

diff --cc drivers/net/isa-skeleton.c
Simple merge

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

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

diff --cc drivers/net/usb/kaweth.c
Simple merge

diff --cc drivers/net/usb/pegasus.c
Simple merge

diff --cc drivers/net/via-rhine.c
Simple merge

diff --cc drivers/net/wireless/orinoco/main.c
Simple merge

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

diff --cc net/ipv6/ip6_output.c
Simple merge

diff --cc net/ipv6/sit.c
Simple merge