From:  <jgarzik@pretzel.yyz.us>
Date: Thu, 26 May 2005 02:10:53 +0000 (-0400)
Subject: Automatic merge of /spare/repo/netdev-2.6 branch ns83820
X-Git-Tag: v2.6.12-rc6~145^2~5
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f5a702b26a0cd6052f0bae2bc3f0548538d3909c;p=linux-2.6-omap-h63xx.git

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

f5a702b26a0cd6052f0bae2bc3f0548538d3909c