]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 17 May 2010 05:26:58 +0000 (22:26 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 17 May 2010 05:26:58 +0000 (22:26 -0700)
commit63c01a4b4369c4d1c87fb2ccd36f8abcabf8aaa7
treec25d5b0e49ec848943d35f819e748d157ccb492e
parentee1f36f06ebafc271f64820f074ff0f79cf48ade
parente1c2c45c8124c786f9c26919c00231cc4e9facf3
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
include/linux/if_link.h
drivers/vhost/vhost.c
include/linux/if_link.h
include/net/tcp.h
net/core/rtnetlink.c
net/ipv4/tcp.c
net/sctp/transport.c