tree 21554af057d7b1cdadbe8d0b0ccfd24bf72bcc21
parent 0c2fc10901e1b516526c92849ccd03327f119dbe
parent 41480af27a85d6008d9e11db8bc2730407c25e1d
author  <jgarzik@pretzel.yyz.us> 1117073392 -0400
committer Jeff Garzik <jgarzik@pobox.com> 1117073392 -0400

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