Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into...
Jeff Garzik [Thu, 31 Aug 2006 21:39:21 +0000 (17:39 -0400)]

Trivial merge