From: Jeff Garzik <jeff@garzik.org>
Date: Sat, 4 Mar 2006 17:07:07 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1186^2~15
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb15b9dd8b3f44290a7b3b06fdfd4be2ad73f0ac;p=linux-2.6

Merge branch 'upstream-fixes'
---

fb15b9dd8b3f44290a7b3b06fdfd4be2ad73f0ac