]> nv-tegra.nvidia Code Review - linux-3.10.git/commitdiff
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
net/ipv6/udp.c

Simple merge
diff --cc net/ipv6/udp.c
Simple merge