Merge branch 'net-2.6-misc-20080605a' of git://git.linux-ipv6.org/gitroot/yoshfuji...
authorDavid S. Miller <davem@davemloft.net>
Wed, 4 Jun 2008 19:10:21 +0000 (12:10 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 4 Jun 2008 19:10:21 +0000 (12:10 -0700)

Trivial merge