tree 5efa09ed89088363d6b1ea1d3c76bad1eeccc5b8
parent 5ea6f2c33f0c8b126136dbf1776ffbc444772cd7
parent c16ef1ceedff27c1b452724ca7f89b729651098f
author  <jgarzik@pretzel.yyz.us> 1117073453 -0400
committer Jeff Garzik <jgarzik@pobox.com> 1117073453 -0400

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