Merge branch 'net-next-2.6-v6ready-20080703' of git://git.linux-ipv6.org/gitroot...
authorDavid S. Miller <davem@davemloft.net>
Thu, 3 Jul 2008 10:07:58 +0000 (03:07 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 Jul 2008 10:07:58 +0000 (03:07 -0700)

Trivial merge