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)

Trivial merge