tree f4f85c70a56706b9966f24b638ffdfa6a9f98502
parent 1a9505996dd0c12a2e56d2c6af00846e75a3850d
parent fdecea66687d76c7d19be6559586df5c51023d11
author  <jgarzik@pretzel.yyz.us> 1117919982 -0400
committer Jeff Garzik <jgarzik@pobox.com> 1117919982 -0400

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