From:  <jgarzik@pretzel.yyz.us>
Date: Sat, 28 May 2005 02:07:40 +0000 (-0400)
Subject: Automatic merge of /spare/repo/netdev-2.6 branch we18
X-Git-Tag: v2.6.14-rc1~1017^2~47^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ff0e0ea2f5d36fa90fc2c57fd019102b0a0cfabf;p=users%2Fjedix%2Flinux-maple.git

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

ff0e0ea2f5d36fa90fc2c57fd019102b0a0cfabf