From: Dmitry Torokhov <dtor_core@ameritech.net>
Date: Wed, 1 Jun 2005 07:37:23 +0000 (-0500)
Subject: Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~40671^2~43^2~22
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9d5432979951c8761c2b4517007039b9bcc1c110;p=mirror_ubuntu-zesty-kernel.git

Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
---

9d5432979951c8761c2b4517007039b9bcc1c110