Merge branch 'net-2.6-misc-20080611a' of git://git.linux-ipv6.org/gitroot/yoshfuji...
authorDavid S. Miller <davem@davemloft.net>
Thu, 12 Jun 2008 01:11:16 +0000 (18:11 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 12 Jun 2008 01:11:16 +0000 (18:11 -0700)

Trivial merge