tree 313bd1e38f290c988e8ebb468365d9299001a2fb
parent 9b7530c83d04da28fdded741e718721d509c74b1
parent 313b0305b5a1e7e0fb39383befbf79558ce68a9c
author Jeff Garzik <jeff@garzik.org> 1186522103 -0400
committer Jeff Garzik <jeff@garzik.org> 1186522103 -0400

Merge branch 'r8169-for-jeff-20070806' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into upstream-fixes