tree bc58fe0a4cd3d8878aef4ef7e9af6764a99715cc
parent 187ff3b8575569668cde9021b9fe70386a4131fb
parent 59b693fbbec37765426ba0916920ff93d2e26eb3
author Jeff Garzik <jeff@garzik.org> 1154150811 -0400
committer Jeff Garzik <jeff@garzik.org> 1154150811 -0400

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