From: Jeff Garzik <jgarzik@pretzel.yyz.us>
Date: Mon, 27 Jun 2005 04:27:47 +0000 (-0400)
Subject: Merge /spare/repo/netdev-2.6/ branch 'orinoco'
X-Git-Tag: v2.6.13-rc1~51^2~40^2~24
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9758d0f028b4c73a5222168a5ffc340606ecbea1;p=users%2Fjedix%2Flinux-maple.git

Merge /spare/repo/netdev-2.6/ branch 'orinoco'
---

9758d0f028b4c73a5222168a5ffc340606ecbea1