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: daily-2014.03.25.0_l4t/l4t-r19.1~53304^2~289^2~2
X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-3.10.git;a=commitdiff_plain;h=38778204a1ad0d2c266f85170c2fb7d80ed43160;hp=-c

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

38778204a1ad0d2c266f85170c2fb7d80ed43160