From: Jeff Garzik <jeff@garzik.org>
Date: Thu, 3 Aug 2006 21:33:27 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~31098^2~106
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=834695ee415f064036dacdd1b2c414cff1e81cb4;p=mirror_ubuntu-zesty-kernel.git

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

834695ee415f064036dacdd1b2c414cff1e81cb4