Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+advapi-fix/
authorDavid S. Miller <davem@sunset.davemloft.net>
Mon, 21 Nov 2005 04:52:16 +0000 (20:52 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Mon, 21 Nov 2005 04:52:16 +0000 (20:52 -0800)
commit1ef43204f4bd24dcd3156185b19b31b6b4151ae9
tree812293eda94f9e14ee35c0be3d84da4b96f4972e
parent5d5780df23537ad0db72267fe11103d2c23d9b2a
parentdf9890c31a1a447254f39e40c3fd81ad6547945b
Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+advapi-fix/
include/net/ipv6.h
net/ipv6/raw.c
net/ipv6/udp.c