Merge branch 'net-2.6.26-isatap-20080403' of git://git.linux-ipv6.org/gitroot/yoshfuj...
authorDavid S. Miller <davem@davemloft.net>
Tue, 8 Apr 2008 09:33:36 +0000 (02:33 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 Apr 2008 09:33:36 +0000 (02:33 -0700)

Trivial merge