From: Jeff Garzik <jgarzik@pobox.com>
Date: Thu, 2 Feb 2006 21:17:31 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~35066^2~100
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9ac341ae799413708e674bc65c8a72c90dae8d34;p=mirror_ubuntu-zesty-kernel.git

Merge branch 'upstream-fixes'
---

9ac341ae799413708e674bc65c8a72c90dae8d34