From: Jeff Garzik <jeff@garzik.org>
Date: Wed, 14 Jun 2006 00:29:04 +0000 (-0400)
Subject: Merge branch 'master' into upstream
X-Git-Tag: v2.6.18-rc1~1115^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b5ed7639c9f502898af4109e778f5613dacbfd9c;p=linux.git

Merge branch 'master' into upstream
---

b5ed7639c9f502898af4109e778f5613dacbfd9c