From:  <jgarzik@pretzel.yyz.us>
Date: Sat, 4 Jun 2005 21:11:28 +0000 (-0400)
Subject: Automatic merge of /spare/repo/netdev-2.6 branch iff-running
X-Git-Tag: v2.6.14-rc2~49^2~36^2~53^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=140fedb5f2efd1f23b26afb2d812004556ba9515;p=linux-2.6-omap-h63xx.git

Automatic merge of /spare/repo/netdev-2.6 branch iff-running
---

140fedb5f2efd1f23b26afb2d812004556ba9515