Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 3 Dec 2008 03:50:27 +0000 (19:50 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 3 Dec 2008 03:50:27 +0000 (19:50 -0800)
commitaa2ba5f1082dc705745899584aac8416d710c056
treebde0bf4aff036c6bac19a0212194ae1092afb3c9
parent68024541e2e5a8f35e281daaa5068a29e2a538a5
parentf6f7b52e2f6149d2ee365717afff315b05720162
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/ixgbe/ixgbe_main.c
drivers/net/smc91x.c
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