From:  <jgarzik@pretzel.yyz.us>
Date: Thu, 26 May 2005 02:11:28 +0000 (-0400)
Subject: Automatic merge of /spare/repo/netdev-2.6 branch sis900
X-Git-Tag: v2.6.12-rc6~145^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=38778204a1ad0d2c266f85170c2fb7d80ed43160;p=users%2Fjedix%2Flinux-maple.git

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

38778204a1ad0d2c266f85170c2fb7d80ed43160