Merge branch 'master' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 9 Sep 2008 12:09:24 +0000 (05:09 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Sep 2008 12:09:24 +0000 (05:09 -0700)

Trivial merge