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)
commit06802a819a0a2d31c952c0624cea6cd00e4e50da
tree8ccd7c668c7fbd8f08cb89426006040217caf3f1
parent9bd512f619cc116b7830134d7c9f6e404a38c7bf
parent8f3ea33a5078a09eba12bfe57424507809367756
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