From: Linus Torvalds Date: Sun, 16 May 2010 18:11:53 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 X-Git-Tag: upstream/snapshot3+hdmi~14630 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b5dbc858717113c823fe6bb058807c2cb67d1efa;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge git://git./linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: rtnetlink: make SR-IOV VF interface symmetric sctp: delete active ICMP proto unreachable timer when free transport tcp: fix MD5 (RFC2385) support --- b5dbc858717113c823fe6bb058807c2cb67d1efa