From: Jeff Garzik <jeff@garzik.org>
Date: Sat, 19 Aug 2006 21:27:27 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: Ubuntu-5.10.0-12.13~52337^2~27
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=499792ec6dc737467e5486527cef95ed7d74fba9;p=mirror_ubuntu-hirsute-kernel.git

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

499792ec6dc737467e5486527cef95ed7d74fba9