Merge branch 'upstream-fixes-jgarzik' of git://lost.foo-projects.org/~ahkok/git/netde...
authorJeff Garzik <jeff@garzik.org>
Mon, 17 Jul 2006 17:26:52 +0000 (13:26 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 17 Jul 2006 17:26:52 +0000 (13:26 -0400)
commit83b0fe818cd2f6cc03365440f2b7cca297a45b4f
tree6a430963b0348884625ffbe7ba6a6b141f246bbb
parente1b90c416d6e6b71fc63974c1798e3cf55bba77f
parent36902f2e35b132442746df6034462b7cdb7d82ab
Merge branch 'upstream-fixes-jgarzik' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream-fixes