Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into tmp
authorJeff Garzik <jeff@garzik.org>
Wed, 27 Sep 2006 22:01:53 +0000 (18:01 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 27 Sep 2006 22:01:53 +0000 (18:01 -0400)

Trivial merge