From:  <jgarzik@pretzel.yyz.us>
Date: Thu, 26 May 2005 02:07:51 +0000 (-0400)
Subject: Automatic merge of /spare/repo/netdev-2.6 branch atmel
X-Git-Tag: v2.6.12-rc6~145^2~9
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0c2fc10901e1b516526c92849ccd03327f119dbe;p=users%2Fhch%2Fblock.git

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

0c2fc10901e1b516526c92849ccd03327f119dbe