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: firefly_0821_release~42717^2~289^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=38778204a1ad0d2c266f85170c2fb7d80ed43160;p=firefly-linux-kernel-4.4.55.git

Merge ... /spare/repo/netdev-2.6 branch sis900
---

38778204a1ad0d2c266f85170c2fb7d80ed43160