tree 059911292a94d78ba08e553d70035d89a4e7fdf5
parent 090bf62199d6079cc47c0b78ced9508391b24fa1
parent 21e197f231343201368338603cb0909a13961bac
author Jeff Garzik <jeff@garzik.org> 1209448471 -0400
committer Jeff Garzik <jgarzik@redhat.com> 1209448471 -0400

Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 into upstream