Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 31 Oct 2008 06:57:40 +0000 (23:57 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 31 Oct 2008 06:57:40 +0000 (23:57 -0700)

Trivial merge