Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 27 Sep 2010 08:03:03 +0000 (01:03 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 27 Sep 2010 08:03:03 +0000 (01:03 -0700)
commite40051d134f7ee95c8c1f7a3471e84eafc9ab326
tree88eb44e49a75721ae926665a2c42f08badac9d07
parent42099d7a3941d4aaf853caac92b3ae76149fc6e7
parent2cc6d2bf3d6195fabcf0febc192c01f99519a8f3
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/qlcnic/qlcnic_init.c
net/ipv4/ip_output.c
29 files changed:
MAINTAINERS
drivers/net/3c59x.c
drivers/net/atlx/atl1.c
drivers/net/bonding/bond_3ad.c
drivers/net/cxgb3/cxgb3_main.c
drivers/net/e1000e/netdev.c
drivers/net/ibm_newemac/core.c
drivers/net/netxen/netxen_nic_init.c
drivers/net/qlcnic/qlcnic_init.c
drivers/net/r8169.c
drivers/net/smsc911x.c
drivers/net/usb/hso.c
drivers/net/wireless/iwlwifi/iwl-core.c
include/net/addrconf.h
include/net/tcp.h
net/core/dev.c
net/core/sock.c
net/ipv4/ip_gre.c
net/ipv4/ip_output.c
net/ipv4/tcp.c
net/ipv4/tcp_input.c
net/ipv6/addrconf.c
net/ipv6/addrlabel.c
net/ipv6/ip6_output.c
net/rds/tcp_connect.c
net/rds/tcp_listen.c
net/rds/tcp_recv.c
net/rds/tcp_send.c
net/sctp/output.c