Merge branch 'net-2.6.26-netns-20080326' of git://git.linux-ipv6.org/gitroot/yoshfuji...
authorDavid S. Miller <davem@davemloft.net>
Wed, 26 Mar 2008 02:43:59 +0000 (19:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 26 Mar 2008 02:43:59 +0000 (19:43 -0700)

Trivial merge