From: Jeff Garzik <jeff@garzik.org>
Date: Fri, 23 Jun 2006 02:51:46 +0000 (-0400)
Subject: Merge branch 'master' into upstream
X-Git-Tag: v2.6.18-rc1~1081^2~224^2~25
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dbe1ab9514c231c9b062140a107d9dea0eabefcc;p=linux.git

Merge branch 'master' into upstream
---

dbe1ab9514c231c9b062140a107d9dea0eabefcc