]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42ca89c 41a1f8e)
Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6-git-rfc3542
authorDavid S. Miller <davem@sunset.davemloft.net>
Thu, 8 Sep 2005 19:59:43 +0000 (12:59 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 8 Sep 2005 19:59:43 +0000 (12:59 -0700)
1  2 
net/ipv6/exthdrs.c patch | diff1 | diff2 | blob | history
net/ipv6/udp.c patch | diff1 | diff2 | blob | history

diff --cc net/ipv6/exthdrs.c
Simple merge
diff --cc net/ipv6/udp.c
Simple merge
Linux 2.6 source tree