tree e912dbe14b6af76b0ebe853a9976c99616bb8a4c
parent 983f27d37d4fc72c252835cb2ee3103b360735a6
parent 83055d46e5eddbb3574ef5e9c0d9c021bcb75c0b
author Jeff Garzik <jeff@garzik.org> 1148848513 -0400
committer Jeff Garzik <jeff@garzik.org> 1148848513 -0400

Merge branch 'velocity' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into upstream