From: Jeff Garzik <jgarzik@pobox.com>
Date: Thu, 1 Dec 2005 09:51:26 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.16-rc1~474^2~22^2~7^2~49
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62d65a8062530a4b2673999deb9be368fa60ca87;p=linux-2.6

Merge branch 'upstream-fixes'
---

62d65a8062530a4b2673999deb9be368fa60ca87