From:  <jgarzik@pretzel.yyz.us>
Date: Sat, 4 Jun 2005 21:19:42 +0000 (-0400)
Subject: Automatic merge of /spare/repo/netdev-2.6 branch starfire
X-Git-Tag: v2.6.14-rc2~49^2~36^2~53^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=03d661d3d7dd2c20330d775c13157419049f1617;p=linux.git

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

03d661d3d7dd2c20330d775c13157419049f1617