From:  <jgarzik@pretzel.yyz.us>
Date: Sat, 4 Jun 2005 21:01:45 +0000 (-0400)
Subject: Automatic merge of /spare/repo/netdev-2.6 branch 8139too-iomap
X-Git-Tag: v2.6.14-rc2~49^2~36^2~53^2~12
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b00b2f70ddde86b0a4674b8518c78d3ad5dc68b7;p=users%2Fjedix%2Flinux-maple.git

Automatic merge of /spare/repo/netdev-2.6 branch 8139too-iomap
---

b00b2f70ddde86b0a4674b8518c78d3ad5dc68b7