From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 31 Jan 2006 16:52:21 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1186^2~63
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a03b1950521466e007288a25c9fc7ac7f05a97e5;p=linux-2.6

Merge branch 'upstream-fixes'
---

a03b1950521466e007288a25c9fc7ac7f05a97e5