From:  <jgarzik@pretzel.yyz.us>
Date: Sat, 28 May 2005 00:12:17 +0000 (-0400)
Subject: Automatic merge of rsync://www.fr.zoreil.com/linux-2.6.git branch HEAD
X-Git-Tag: v2.6.14-rc2~49^2~36^2~53^2~7^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=befc9e10d64f93472aff0b0280968f447f5402df;p=users%2Fjedix%2Flinux-maple.git

Automatic merge of rsync://www.fr.zoreil.com/linux-2.6.git branch HEAD
---

befc9e10d64f93472aff0b0280968f447f5402df