Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 21 Apr 2009 08:32:26 +0000 (01:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Apr 2009 08:32:26 +0000 (01:32 -0700)
commite5e9743bb7429f53c83ad69b432f7b661e74c3f0
treedb3691aef0d46c4aed4a2be6dc8ab7c44c3488cb
parenta0f82f64e26929776c58a5c93c2ecb38e3d82815
parent775d8d931581764a1ec982ebe5a927b12762fb6d
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
net/core/dev.c
MAINTAINERS
drivers/net/e1000/e1000_main.c
drivers/net/e1000e/netdev.c
drivers/net/ixgbe/ixgbe_main.c
drivers/net/wireless/at76c50x-usb.c
net/core/dev.c