From:  <jgarzik@pretzel.yyz.us>
Date: Thu, 26 May 2005 02:11:06 +0000 (-0400)
Subject: Automatic merge of /spare/repo/netdev-2.6 branch qeth
X-Git-Tag: v2.6.12-rc6~145^2~4
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8a75e7d644b373f86c8c2316392cb7374fc4e063;p=linux.git

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

8a75e7d644b373f86c8c2316392cb7374fc4e063