]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of ../net-2.6/
authorDavid S. Miller <davem@davemloft.net>
Mon, 24 Mar 2008 05:54:03 +0000 (22:54 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Mar 2008 05:54:03 +0000 (22:54 -0700)
commit5ff62e51f0749c1c89c3441f5173f0bd9bf975ad
tree8ccd7c668c7fbd8f08cb89426006040217caf3f1
parent8503130b52249f5082cbb7b197274e19540c83ef
parent4e6278b8efa9b33bcc5227413e1bf42a627e1eb5
Merge branch 'master' of ../net-2.6/

Conflicts:

net/ipv6/ndisc.c
include/net/sctp/sctp.h
net/atm/clip.c
net/atm/lec.c
net/ipv4/fib_trie.c
net/ipv4/tcp.c