Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Wed, 3 Dec 2008 03:50:27 +0000 (19:50 -0800)]
Conflicts:

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

1  2 
MAINTAINERS
drivers/media/dvb/dm1105/dm1105.c
drivers/net/Kconfig
drivers/net/macvlan.c
drivers/net/smc911x.c
drivers/net/smc91x.c
drivers/net/xen-netfront.c
net/unix/af_unix.c
net/unix/garbage.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge