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)
commit2e66fc41169c90d93b7811caf7e7822de6aa2259
tree014db698b03f898c560919e56fbdae8ca6ad3dd5
parent42ca89c18b75e1c4c3b02aa5589ad3aa916909a8
parent41a1f8ea4fbfcdc4232f023732584aae2220de31
Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6-git-rfc3542
net/ipv6/exthdrs.c
net/ipv6/udp.c