tree c2beb29f8e4f5c1ea246d792693f8af4f7f03fef
parent f5a702b26a0cd6052f0bae2bc3f0548538d3909c
parent 05e08a2a297371564020f76d1bf8b3a931d5e1ed
author  <jgarzik@pretzel.yyz.us> 1117073466 -0400
committer Jeff Garzik <jgarzik@pobox.com> 1117073466 -0400

Automatic merge of /spare/repo/netdev-2.6 branch qeth