From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 3 Jan 2006 15:58:53 +0000 (-0500)
Subject: Merge branch 'master'
X-Git-Tag: Ubuntu-5.0.0-8.9~50903^2~130^2~1^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a18ceba7b40e24a9da87249bd74f16ea5abd6894;p=mirror_ubuntu-disco-kernel.git

Merge branch 'master'
---

a18ceba7b40e24a9da87249bd74f16ea5abd6894