Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 27 Oct 2009 08:03:26 +0000 (01:03 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 27 Oct 2009 08:03:26 +0000 (01:03 -0700)
commitcfadf853f6cd9689f79a63ca960c6f9d6665314f
tree35418e342d9783f0974ea33ef03875aa21d2362a
parent05423b241311c9380b7280179295bac7794281b6
parentf568a926a353d6816b3704d7367f34371df44ce7
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/sh_eth.c
29 files changed:
drivers/net/Kconfig
drivers/net/benet/be_cmds.c
drivers/net/benet/be_cmds.h
drivers/net/benet/be_main.c
drivers/net/bonding/bond_main.c
drivers/net/e1000e/e1000.h
drivers/net/ethoc.c
drivers/net/gianfar.c
drivers/net/ibm_newemac/core.c
drivers/net/igb/igb_ethtool.c
drivers/net/igbvf/ethtool.c
drivers/net/ixgbe/ixgbe_ethtool.c
drivers/net/myri10ge/myri10ge.c
drivers/net/netxen/netxen_nic_hdr.h
drivers/net/netxen/netxen_nic_hw.c
drivers/net/netxen/netxen_nic_init.c
drivers/net/netxen/netxen_nic_main.c
drivers/net/niu.c
drivers/net/r8169.c
drivers/net/sh_eth.c
drivers/net/virtio_net.c
include/net/inet_timewait_sock.h
net/bluetooth/l2cap.c
net/core/pktgen.c
net/ipv4/inet_connection_sock.c
net/ipv4/ip_sockglue.c
net/ipv4/tcp.c
net/ipv6/ipv6_sockglue.c
net/unix/af_unix.c