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

Conflicts:

	drivers/net/ixgbe/ixgbe_main.c
	drivers/net/smc91x.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/media/dvb/dm1105/dm1105.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

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

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

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

diff --cc drivers/net/xen-netfront.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge

diff --cc net/unix/garbage.c
Simple merge