tree 1d81c7707135ac0d7b19777f125113981a0cab89
parent 43cd73658d8077ee6899b0b5029aad0cba1e9f92
parent 194b2d0e9216dbd3a57fda31440611d515f1dfa2
author Jeff Garzik <jeff@garzik.org> 1193184905 -0400
committer Jeff Garzik <jeff@garzik.org> 1193184905 -0400

Merge branch 'bug-fixes' of git://farnsworth.org/dale/linux-2.6-mv643xx_eth into upstream