summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-16 11:11:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-16 11:11:53 -0700
commitb5dbc858717113c823fe6bb058807c2cb67d1efa (patch)
treee82858156bf5d46b539455728ac1b8a7cd9feb02 /Makefile
parentd34e14f690d611ffe3db09e4ed8123d86c89a831 (diff)
parentc02db8c6290bb992442fec1407643c94cc414375 (diff)
downloadop-kernel-dev-b5dbc858717113c823fe6bb058807c2cb67d1efa.zip
op-kernel-dev-b5dbc858717113c823fe6bb058807c2cb67d1efa.tar.gz
Merge git://git.kernel.org/pub/scm/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
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud