Merge branch 'master' of git://eden-feed.erg.abdn.ac.uk/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 12 Jun 2008 00:53:04 +0000 (17:53 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 12 Jun 2008 00:53:04 +0000 (17:53 -0700)

Trivial merge