]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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)
Conflicts:

net/ipv6/ndisc.c

1  2 
include/net/sctp/sctp.h
net/atm/clip.c
net/atm/lec.c
net/ipv4/fib_trie.c
net/ipv4/tcp.c

Simple merge
diff --cc net/atm/clip.c
Simple merge
diff --cc net/atm/lec.c
Simple merge
Simple merge
diff --cc net/ipv4/tcp.c
Simple merge