Merge branch 'net-2.6.26-misc-20080412b' of git://git.linux-ipv6.org/gitroot/yoshfuji...
authorDavid S. Miller <davem@davemloft.net>
Sun, 13 Apr 2008 02:19:46 +0000 (19:19 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 13 Apr 2008 02:19:46 +0000 (19:19 -0700)

Trivial merge