Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 4 Oct 2010 18:56:38 +0000 (11:56 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 4 Oct 2010 18:56:38 +0000 (11:56 -0700)
commit21a180cda012e1f93e362dd4a9b0bfd3d8c92940
tree0e0d10baa3fdcd8ffbc6881076ff1695808dad9d
parentc7d4426a98a5f6654cd0b4b33d9dab2e77192c18
parent51e97a12bef19b7e43199fc153cf9bd5f2140362
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
net/ipv4/Kconfig
net/ipv4/tcp_timer.c
13 files changed:
drivers/net/3c59x.c
drivers/net/Kconfig
drivers/net/tulip/de2104x.c
net/8021q/vlan_core.c
net/core/iovec.c
net/ipv4/Kconfig
net/ipv4/route.c
net/ipv4/tcp.c
net/ipv4/tcp_input.c
net/ipv4/tcp_timer.c
net/ipv6/route.c
net/phonet/pep.c
net/sctp/socket.c