From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 18 Oct 2005 15:40:46 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-serial
X-Git-Tag: Ubuntu-5.2.0-15.16~55443^2~117^2~31
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ace7c769378b9fb2f1fd2c60c04ba3591a6a5af5;p=mirror_ubuntu-eoan-kernel.git

Merge master.kernel.org:/home/rmk/linux-2.6-serial
---

ace7c769378b9fb2f1fd2c60c04ba3591a6a5af5