From: Jeff Garzik <jeff@garzik.org>
Date: Wed, 11 Oct 2006 07:56:12 +0000 (-0400)
Subject: Merge branch 'master' into upstream-fixes
X-Git-Tag: v2.6.19-rc2~23^2~32
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24fcbacedb0d83cabc6761acbecfbf751265ce52;p=linux-2.6

Merge branch 'master' into upstream-fixes
---

24fcbacedb0d83cabc6761acbecfbf751265ce52