Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 2 Sep 2009 07:32:56 +0000 (00:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 2 Sep 2009 07:32:56 +0000 (00:32 -0700)
commit6cdee2f96a97f6da26bd3759c3f8823332fbb438
treeec79086f05ffc3bdf1aecc37e108ccfc3a95450d
parent0625491493d9000e4556bf566d205c28c8e7dc4e
parent2fbd3da3877ad8d923b055e5996f80b4d4a6daf4
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/yellowfin.c
31 files changed:
drivers/net/Kconfig
drivers/net/arm/w90p910_ether.c
drivers/net/b44.c
drivers/net/bnx2.c
drivers/net/bnx2.h
drivers/net/cnic.c
drivers/net/e100.c
drivers/net/e1000e/netdev.c
drivers/net/gianfar.c
drivers/net/ibm_newemac/core.c
drivers/net/irda/au1k_ir.c
drivers/net/irda/pxaficp_ir.c
drivers/net/irda/sa1100_ir.c
drivers/net/ixp2000/ixpdev.c
drivers/net/macb.c
drivers/net/mlx4/en_tx.c
drivers/net/smc91x.c
drivers/net/tulip/tulip_core.c
drivers/net/ucc_geth.c
drivers/net/via-rhine.c
drivers/net/via-velocity.c
drivers/net/virtio_net.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/orinoco/hw.c
drivers/net/wireless/rtl818x/rtl8187_dev.c
drivers/net/yellowfin.c
include/net/sch_generic.h
net/core/netpoll.c
net/core/sock.c
net/ipv4/ip_gre.c
net/ipv6/af_inet6.c